raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-03 22:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patching a couple more issues

Browse Source
This commit is contained in:
Will Marshall
2014-05-02 15:17:44 +10:00
parent b907616749
commit 23fa1c7b7b
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/checkout_controller.rb
View File

@@ -120,7 +120,7 @@ class CheckoutController < Spree::CheckoutController
# Overriding to customize the cancel url
def order_opts_with_new_cancel_return_url(order, payment_method_id, stage)
opts = order_opts_without_new_cancel_return_url(order, payment_method_id, stage)
opts[:cancel_return_url] = main_app.shop_checkout_url
opts[:cancel_return_url] = main_app.checkout_url
opts
end
alias_method_chain :order_opts, :new_cancel_return_url

2
spec/controllers/checkout_controller_spec.rb
View File

@@ -125,7 +125,7 @@ describe CheckoutController do
it "should override the cancel return url" do
controller.stub(:params).and_return({payment_method_id: payment_method.id})
controller.send(:order_opts, order, payment_method.id, 'payment')[:cancel_return_url].should == shop_checkout_url
controller.send(:order_opts, order, payment_method.id, 'payment')[:cancel_return_url].should == checkout_url
end
end
end

7
spec/features/consumer/home_spec.rb
View File

@@ -4,13 +4,12 @@ feature 'Home', js: true do
include AuthenticationWorkflow
include UIComponentHelper
let(:distributor) { create(:distributor_enterprise) }
let!(:distributor) { create(:distributor_enterprise) }
let(:d1) { create(:distributor_enterprise) }
let(:d2) { create(:distributor_enterprise) }
let(:order_cycle) { create(:order_cycle, distributors: [distributor], coordinator: create(:distributor_enterprise)) }
let!(:order_cycle) { create(:order_cycle, distributors: [distributor], coordinator: create(:distributor_enterprise)) }
before do
distributor
order_cycle
visit "/"
end