Merge pull request #1 from deseretbook/migrate_to_solidus

Migrate to solidus

Author: dgra

Gemfile

@@ -1,10 +1,17 @@
 source 'https://rubygems.org'
 
-spree_branch = "2-2-stable"
-gem 'spree_core', github: 'spree/spree', branch: spree_branch
-gem 'spree_backend', github: 'spree/spree', branch: spree_branch
-gem 'spree_api', github: 'spree/spree', branch: spree_branch
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: spree_branch
-gem 'spree_i18n', github: 'spree/spree_i18n', branch: spree_branch
+gem 'therubyracer', group: :development
+
+gem 'solidus', '~> 1.3.0'
+gem 'solidus_auth_devise'
+gem 'solidus_backend'
+gem 'solidus_api'
+gem 'solidus_i18n'
+
+group :development, :test do
+  # Call `binding.pry` anywhere in the code to stop execution and get a debugger console.
+  gem 'byebug'
+  gem 'pry-byebug'
+end
 
 gemspec

README.md

@@ -1,17 +1,17 @@
-Spree Notes
+Solidus Notes
 ================
 
 Installation
 ------------
 
 Add to `Gemfile`:
 
-    gem 'spree_notes', :git => 'git://github.com/railsdog/spree_notes.git'
+    gem 'solidus_notes', :git => 'git://github.com/deseretbook/solidus_notes.git'
 
 Run:
 
     $ bundle
-    $ bundle exec rails g spree_notes:install
+    $ bundle exec rails g solidus_notes:install
 
 Development
 -----------

Rakefile

@@ -9,6 +9,6 @@ task :default => [:spec]
 
 desc "Generates a dummy app for testing"
 task :test_app do
-  ENV['LIB_NAME'] = 'spree_notes'
+  ENV['LIB_NAME'] = 'solidus_notes'
   Rake::Task['common:test_app'].invoke
 end

app/assets/javascripts/spree/backend/spree_notes.js app/assets/javascripts/spree/backend/solidus_notes.js

@@ -1,15 +1,14 @@
 @import 'spree/backend/globals/functions';
 @import 'spree/backend/globals/variables_override';
 @import 'spree/backend/globals/variables';
-@import 'spree/backend/globals/mixins';
 
 .important-notes-banner{
   .important-notes-banner-inner{
     width: 80%;
     padding: 7px;
     border: 1px solid $color-action-void-brd;
     background-color: $color-action-void-bg;
-    @include border-radius(3px);
+    border-radius: 3px;
     color: $color-error;
   }
 }
@@ -20,7 +19,7 @@
   float: left;
   margin-bottom: 15px;
   border: 1px solid $color-border;
-  @include border-radius(3px);
+  border-radius: 3px;
 
   .note-icon{
     float: left;

app/assets/stylesheets/spree/backend/spree_notes.css.scss app/assets/stylesheets/spree/backend/solidus_notes.scss

@@ -5,7 +5,7 @@ def change
       t.column :body, :text
       t.column :important, :boolean, default: false
       t.column :author, :string
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

db/migrate/20140627182438_create_spree_notes.rb

@@ -1,18 +1,18 @@
-module SpreeNotes
+module SolidusNotes
   module Generators
     class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, :type => :boolean, :default => false
 
       def add_javascripts
-        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_notes\n"
+        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_notes\n"
       end
 
       def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_notes\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_notes\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations
-        run 'bundle exec rake railties:install:migrations FROM=spree_notes'
+        run 'bundle exec rake railties:install:migrations FROM=solidus_notes'
       end
 
       def run_migrations

lib/generators/spree_notes/install/install_generator.rb lib/generators/solidus_notes/install/install_generator.rb

@@ -1,11 +1,10 @@
-require 'spree_backend'
-require 'spree_core'
+require 'solidus_backend'
+require 'solidus_core'
 
-module SpreeNotes
+module SolidusNotes
   class Engine < Rails::Engine
-    require 'spree/core'
     isolate_namespace Spree
-    engine_name 'spree_notes'
+    engine_name 'solidus_notes'
 
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|

lib/spree_notes.rb lib/solidus_notes.rb

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
-  s.name        = 'spree_notes'
+  s.name        = 'solidus_notes'
   s.version     = '0.0.2'
   s.summary     = 'Allows admins to add custom notes to orders and users'
   s.description = 'Allows admins to add custom notes to orders and users'
@@ -17,13 +17,13 @@ Gem::Specification.new do |s|
 
   # s.has_rdoc = true
 
-  s.add_development_dependency 'factory_girl', '4.4'
+  s.add_development_dependency 'factory_girl'
   s.add_development_dependency 'ffaker'
-  s.add_development_dependency 'rspec-rails', '2.14'
-  s.add_development_dependency 'sqlite3', '~> 1.3.8'
-  s.add_development_dependency 'capybara', '~> 2.2.1'
-  s.add_development_dependency 'poltergeist', '~> 1.5.0'
-  s.add_development_dependency 'database_cleaner', '~> 1.2.0'
-  s.add_development_dependency 'sass-rails', '~> 4.0.0'
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'capybara'
+  s.add_development_dependency 'poltergeist'
+  s.add_development_dependency 'database_cleaner'
+  s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'pry-rails'
 end

spree_notes.gemspec solidus_notes.gemspec

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
-describe 'notes on edit admin order page' do
-  before(:each) do
+describe 'notes on edit admin order page', type: :feature do
+  before(:each) do 
     admin_user = create(:admin_user)
-    stub_admin_login! admin_user
+    stub_admin_login!(admin_user)
   end
 
   context 'creating', js: true do
@@ -14,14 +12,14 @@
     end
 
     it 'does not show the create note form initially' do
-      expect(find('.js-create-note-form', visible: false).visible?).to be_false
+      expect(find('.js-create-note-form', visible: false).visible?).to be false
     end
 
     it 'shows the create note form after clicking the create note button' do
       within_fieldset 'admin_order_edit_notes' do
         click_button 'Create New Note'
       end
-      expect(find('.js-create-note-form', visible: false).visible?).to be_true
+      expect(find('.js-create-note-form', visible: false).visible?).to be true
     end
 
     it 'can successfully create an unimportant note' do

spec/features/edit_admin_order_spec.rb

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
-describe 'notes on edit admin user page' do
-  before(:each) do
+describe 'notes on edit admin user page', type: :feature do
+  before(:each) do 
     admin_user = create(:admin_user)
-    stub_admin_login! admin_user
+    stub_admin_login!(admin_user)
   end
 
   context 'creating', js: true do
@@ -14,14 +12,14 @@
     end
 
     it 'does not show the create note form initially' do
-      expect(find('.js-create-note-form', visible: false).visible?).to be_false
+      expect(find('.js-create-note-form', visible: false).visible?).to be false
     end
 
     it 'shows the create note form after clicking the create note button' do
       within_fieldset 'admin_user_edit_notes' do
         click_button 'Create New Note'
       end
-      expect(find('.js-create-note-form', visible: false).visible?).to be_true
+      expect(find('.js-create-note-form', visible: false).visible?).to be true
     end
 
     it 'can successfully create an unimportant note' do

spec/features/edit_admin_user_spec.rb

@@ -33,21 +33,21 @@
 
     it '.important scope returns only important notes' do
       Spree::Note.important.each do |note|
-        expect(note.important).to be_true
+        expect(note.important).to be true
       end
     end
 
     it '.not_important scope returns only unimportant notes' do
       Spree::Note.not_important.each do |note|
-        expect(note.important).to be_false
+        expect(note.important).to be false
       end
     end
 
     context 'finders always return notes ordered' do
       it 'with important notes first primarily' do
         Spree::Note.all.each_cons(2) do |current_note, next_note|
           if current_note.important != next_note.important
-            expect(next_note.important).to be_false
+            expect(next_note.important).to be false
           end
         end
       end

spec/models/spree/notes_spec.rb

@@ -13,6 +13,7 @@
 # Testing support from spree_core
 require 'spree/testing_support/factories'
 require 'spree/testing_support/flash'
+require 'spree/testing_support/authorization_helpers'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -41,7 +42,7 @@
 
   # Before each spec check if it is a Javascript test and switch between using database transactions or not where necessary.
   config.before :each do
-    DatabaseCleaner.strategy = example.metadata[:js] ? :truncation : :transaction
+    DatabaseCleaner.strategy = RSpec.current_example.metadata[:js] ? :truncation : :transaction
     DatabaseCleaner.start
   end