Spree 2-2

Willianvdv · Feb 23, 2014 · c6ca830 · c6ca830
1 parent 717bbe3
commit c6ca830
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 14 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,11 +1,9 @@
 source 'https://rubygems.org'
 
-# Provides basic authentication functionality for testing parts of your engine
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-1-stable'
-gem 'coveralls', require: false
-
 group :test do
-  gem 'spree', github: 'spree/spree', branch: '2-1-stable' 
+  gem 'coveralls', require: false
+  gem 'spree', github: 'spree/spree', branch: '2-2-stable'
+  gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-2-stable'
 end
 
 gemspec
diff --git a/app/assets/javascripts/admin/spree_private_properties.js b/app/assets/javascripts/admin/spree_private_properties.js
diff --git a/...sheets/admin/spree_private_properties.css → ...spree/backend/spree_private_properties.js b/...sheets/admin/spree_private_properties.css → ...spree/backend/spree_private_properties.js
diff --git a/...sheets/store/spree_private_properties.css → ...pree/frontend/spree_private_properties.js b/...sheets/store/spree_private_properties.css → ...pree/frontend/spree_private_properties.js
diff --git a/app/assets/javascripts/store/spree_private_properties.js b/app/assets/javascripts/store/spree_private_properties.js
diff --git a/app/assets/stylesheets/spree/backend/spree_private_properties.css b/app/assets/stylesheets/spree/backend/spree_private_properties.css
diff --git a/app/assets/stylesheets/spree/frontend/spree_private_properties.css b/app/assets/stylesheets/spree/frontend/spree_private_properties.css
diff --git a/lib/generators/spree_private_properties/install/install_generator.rb b/lib/generators/spree_private_properties/install/install_generator.rb
@@ -4,12 +4,6 @@ class InstallGenerator < Rails::Generators::Base
 
       class_option :auto_run_migrations, :type => :boolean, :default => false
 
-      def add_javascripts
-      end
-
-      def add_stylesheets
-      end
-
       def add_migrations
         run 'bundle exec rake railties:install:migrations FROM=spree_private_properties'
       end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -28,6 +28,7 @@
 
 # Requires factories defined in spree_core
 require 'spree/testing_support/factories'
+require 'spree/testing_support/preferences'
 require 'spree/testing_support/controller_requests'
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/url_helpers'
@@ -86,7 +87,7 @@
   config.include Spree::TestingSupport::Preferences
   config.include Spree::TestingSupport::UrlHelpers
   config.include Spree::TestingSupport::ControllerRequests
-  
+
 
   config.fail_fast = ENV['FAIL_FAST'] || false
 end