Gemfile, gemspec, Rakefile, and spec_support updates to run with 2.2.x

Tests are running, but not passing with 2.2.x

Gemfile

@@ -2,10 +2,10 @@ source "http://rubygems.org"
 gemspec
 
 group :test do
-  gem 'sass-rails',   '~> 3.2.5'
-  gem 'coffee-rails', '~> 3.2.1'
+  gem 'sass-rails'
+  gem 'coffee-rails'
   gem 'pry-nav'
 end
 
-gem 'spree_auth_devise', :git => 'git://github.com/spree/spree_auth_devise', :branch => '1-3-stable'
-gem 'spree', '~> 1.3.5'
+gem 'spree_auth_devise', :git => 'git://github.com/spree/spree_auth_devise', :branch => '2-2-stable'
+gem 'spree', '~> 2.2.4'

Rakefile

@@ -1,11 +1,10 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
-Bundler.setup
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new
+require 'spree/testing_support/common_rake'
 
-require 'spree/core/testing_support/common_rake'
+RSpec::Core::RakeTask.new
 
 task :default => [:spec]
 

spec/spec_helper.rb

@@ -1,26 +1,23 @@
-# Configure Rails Environment
 ENV["RAILS_ENV"] ||= "test"
-
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 
 require 'rspec/rails'
 require 'database_cleaner'
 require 'ffaker'
 
-# Requires supporting ruby files with custom matchers and macros, etc,
-# in spec/support/ and its subdirectories.
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each {|f| require f }
 
 # Requires factories defined in spree_core
-require 'spree/core/testing_support/factories'
-require 'spree/core/testing_support/controller_requests'
-require 'spree/core/testing_support/preferences'
-require 'spree/core/url_helpers'
+require 'spree/testing_support/factories'
+require 'spree/testing_support/controller_requests'
+require 'spree/testing_support/authorization_helpers'
+require 'spree/testing_support/preferences'
+require 'spree/testing_support/url_helpers'
 
 RSpec.configure do |config|
   config.mock_with :rspec
   config.use_transactional_fixtures = false
-  config.include Spree::Core::UrlHelpers
+  config.include Spree::TestingSupport::UrlHelpers
 
   config.before(:each) do
     if example.metadata[:js]

spree_address_book.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.add_dependency('spree_core', '~> 2.1')
   s.add_dependency('spree_auth_devise')
 
-  s.add_development_dependency('rspec-rails',  '2.12.0')
+  s.add_development_dependency('rspec-rails',  '2.14.0')
   s.add_development_dependency('sqlite3')
-  s.add_development_dependency('capybara', '1.1')
-  s.add_development_dependency('factory_girl_rails', '1.7.0')
+  s.add_development_dependency('capybara', '~> 2.1')
+  s.add_development_dependency('factory_girl_rails', '4.4.0')
   s.add_development_dependency('database_cleaner')
   s.add_development_dependency('ffaker')
 end