Bump rails to 3.1.8

Gemfile

@@ -5,8 +5,8 @@ gem 'sqlite3'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails', "~> 3.1.4"
-  gem 'coffee-rails', "~> 3.1.1"
+  gem 'sass-rails', '~> 3.1.6'
+  gem 'coffee-rails', '~> 3.1.1'
   gem 'uglifier'
 end
 
@@ -26,8 +26,7 @@ group :test do
 
   gem 'ffaker'
   gem 'shoulda-matchers', '~> 1.0.0'
-  gem 'capybara'
-  gem 'selenium-webdriver', '2.16.0'
+  gem 'capybara', '1.1.3'
   gem 'database_cleaner', '0.7.1'
   gem 'launchy'
 end
@@ -37,11 +36,11 @@ group :ci do
 end
 
 # platform :ruby_18 do
-#   gem "ruby-debug"
+#   gem 'ruby-debug'
 # end
 
 # platform :ruby_19 do
-#   gem "ruby-debug19"
+#   gem 'debugger'
 # end
 
 gemspec

README.md

@@ -30,9 +30,9 @@ The fastest way to get started is by using the spree command line tool
 available in the spree gem. It will add Spree to an existing Rails
 application.
 
-    $ gem install rails -v 3.1.6
-    $ gem install spree -v 1.0.5
-    $ rails _3.1.6_ new my_store
+    $ gem install rails -v 3.1.8
+    $ gem install spree -v 1.0.6
+    $ rails _3.1.8_ new my_store
     $ spree install my_store
 
 This will add the Spree gem, create initializers, copy migrations and

core/spec/models/product/scopes_spec.rb

@@ -370,12 +370,13 @@
     products.should_not include(other_product)
   end
 
-  context "on_hand" do
+  context ".on_hand" do
     # Regression test for #2111
     context "A product with a deleted variant" do
       before do
-        variant = product.variants.create({:count_on_hand => 300}, :without_protection => true)
-        variant.update_column(:deleted_at, Time.now)
+        product = Factory(:product)
+        variant = Factory(:variant, :product => product, :on_hand => 100, :deleted_at => Time.now)
+        product.save!
       end
 
       it "does not include the deleted variant in on_hand summary" do

core/spree_core.gemspec

@@ -21,14 +21,14 @@ Gem::Specification.new do |s|
   s.add_dependency 'acts_as_list', '= 0.1.4'
   s.add_dependency 'nested_set', '= 1.6.8'
 
-  s.add_dependency 'jquery-rails', '>= 1.0.18', '<= 1.0.19'
+  s.add_dependency 'jquery-rails', '~> 2.1'
   s.add_dependency 'highline', '= 1.6.8'
   s.add_dependency 'state_machine', '= 1.1.1'
   s.add_dependency 'ffaker', '~> 1.12.0'
-  s.add_dependency 'paperclip', '= 2.7.0'
+  s.add_dependency 'paperclip', '~> 2.8.0'
   s.add_dependency 'meta_search', '= 1.1.1'
   s.add_dependency 'activemerchant', '= 1.20.1'
-  s.add_dependency 'rails', '~> 3.1.6'
+  s.add_dependency 'rails', '~> 3.1.8'
   s.add_dependency 'kaminari', '>= 0.13.0'
   s.add_dependency 'deface', '>= 0.9.0'
   s.add_dependency 'stringex', '~> 1.3.2'

install.rb

@@ -4,13 +4,13 @@
 
 %w( core auth api dash promo sample ).each do |framework|
   puts "Installing #{framework}..."
-  
+
   Dir.chdir(framework) do
     `gem build spree_#{framework}.gemspec`
     `gem install spree_#{framework}-#{version}.gem --no-ri --no-rdoc`
     FileUtils.remove "spree_#{framework}-#{version}.gem"
   end
-  
+
 end
 
 puts "Installing Spree..."