raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into products-caching

Browse Source 
Conflicts:
	spec/features/admin/variant_overrides_spec.rb
This commit is contained in:
Rohan Mitchell
2016-03-18 09:59:56 +11:00
parent 7e65b3176d 21a7942de6
commit 16741598fd
23 changed files with 105 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/features/admin/payment_method_spec.rb
View File

@@ -44,7 +44,7 @@ feature %q{
select2_select "PayPal Express", from: "payment_method_type"
click_button 'Update'
expect(flash_message).to eq 'Payment Method has been successfully updated!'
flash_message.should eq 'Payment Method has been successfully updated!'
payment_method = Spree::PaymentMethod.find_by_name('New PM Name')
expect(payment_method.distributors).to include @distributors[1], @distributors[2]