Changes for Spree 2-2-stable

Test does not pass due to a bug in spree_static_content (spree-contrib/spree_static_content#146)
stefansenk · Feb 23, 2014 · e33b66c · e33b66c
1 parent 64887f5
commit e33b66c
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 17 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,9 +4,9 @@ group :assets do
   gem 'therubyracer'
 end
 
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-1-stable'
-
-gem 'spree_related_products', github: 'spree/spree_related_products', branch: '2-1-stable'
+gem 'spree', github: 'spree/spree', branch: '2-2-stable'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-2-stable'
+gem 'spree_related_products', github: 'spree/spree_related_products', branch: '2-2-stable'
 gem 'spree_static_content', github: 'spree/spree_static_content', branch: 'master'
 
 gemspec
diff --git a/app/assets/javascripts/admin/spree_admin_bar.js b/app/assets/javascripts/admin/spree_admin_bar.js
diff --git a/app/assets/javascripts/spree/backend/spree_admin_bar.js b/app/assets/javascripts/spree/backend/spree_admin_bar.js
diff --git a/app/assets/javascripts/spree/frontend/spree_admin_bar.js b/app/assets/javascripts/spree/frontend/spree_admin_bar.js
diff --git a/app/assets/javascripts/store/spree_admin_bar.js b/app/assets/javascripts/store/spree_admin_bar.js
diff --git a/app/assets/stylesheets/admin/spree_admin_bar.css b/app/assets/stylesheets/admin/spree_admin_bar.css
diff --git a/app/assets/stylesheets/spree/backend/spree_admin_bar.css b/app/assets/stylesheets/spree/backend/spree_admin_bar.css
diff --git a/...tylesheets/store/spree_admin_bar.css.scss → ...s/spree/frontend/spree_admin_bar.css.scss b/...tylesheets/store/spree_admin_bar.css.scss → ...s/spree/frontend/spree_admin_bar.css.scss
@@ -1,7 +1,3 @@
-/*
- *= require store/spree_frontend
-*/
-
 #admin_bar {
   font-size: 13px;
   font-family: verdana, sans-serif;

diff --git a/lib/generators/spree_admin_bar/install/install_generator.rb b/lib/generators/spree_admin_bar/install/install_generator.rb
@@ -5,13 +5,13 @@ class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, :type => :boolean, :default => false
 
       def add_javascripts
-        append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_admin_bar\n"
-        append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_admin_bar\n"
+        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_admin_bar\n"
+        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_admin_bar\n"
       end
 
       def add_stylesheets
-        inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_admin_bar\n", :before => /\*\//, :verbose => true
-        inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_admin_bar\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_admin_bar\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_admin_bar\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations

diff --git a/spree_admin_bar.gemspec b/spree_admin_bar.gemspec
@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 2.1.0'
 
   s.add_development_dependency 'capybara', '~> 2.1'
   s.add_development_dependency 'coffee-rails'