dinislage/spree_digital
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests passing on 1.2

Browse Source
This commit is contained in:
Michael Bianco
2012-10-29 12:55:37 -04:00
parent 7f0de10150
commit fdd8536b5b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -9,4 +9,4 @@ group :test do
end end
end end
gem 'spree', '~> 1.1.3' gem 'spree', '~> 1.2'

3
app/models/spree/order_decorator.rb
View File

@@ -10,7 +10,8 @@ Spree::Order.class_eval do
false false
end 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) def available_shipping_methods(display_on = nil)
return [] unless ship_address return [] unless ship_address

1
spec/spec_helper.rb
View File

@@ -21,7 +21,6 @@ RSpec.configure do |config|
config.include FactoryGirl::Syntax::Methods config.include FactoryGirl::Syntax::Methods
config.include Spree::Core::UrlHelpers config.include Spree::Core::UrlHelpers
config.include Spree::Core::TestingSupport::ControllerRequests config.include Spree::Core::TestingSupport::ControllerRequests
config.include Devise::TestHelpers, :type => :controller
config.use_transactional_fixtures = false config.use_transactional_fixtures = false
config.before(:each) do config.before(:each) do