From fdd8536b5bd40110096b1faec7fe4661b10eaa56 Mon Sep 17 00:00:00 2001
From: Michael Bianco <iloveitaly@gmail.com>
Date: Mon, 29 Oct 2012 12:55:37 -0400
Subject: [PATCH] Tests passing on 1.2

---
 Gemfile                             | 2 +-
 app/models/spree/order_decorator.rb | 3 ++-
 spec/spec_helper.rb                 | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index bc63e9e..0e0a9aa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,4 +9,4 @@ group :test do
   end
 end
 
-gem 'spree', '~> 1.1.3'
+gem 'spree', '~> 1.2'
diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb
index b168b36..c7471f4 100644
--- a/app/models/spree/order_decorator.rb
+++ b/app/models/spree/order_decorator.rb
@@ -10,7 +10,8 @@ Spree::Order.class_eval do
     false
   end
 
-  # UPGRADE_CHECK this works as of spree 1.1.1; make sure to check the original function on upgrade
+  # UPGRADE_CHECK this works as of spree 1.2.0
+  # check function for changes on upgrade
 
   def available_shipping_methods(display_on = nil)
     return [] unless ship_address
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8cefa8f..88860ef 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -21,7 +21,6 @@ RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
   config.include Spree::Core::UrlHelpers
   config.include Spree::Core::TestingSupport::ControllerRequests
-  config.include Devise::TestHelpers, :type => :controller
   config.use_transactional_fixtures = false
 
   config.before(:each) do