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 enterprises

Browse Source 
Conflicts:
	app/controllers/enterprises_controller.rb
	app/views/spree/checkout/_distributor.html.haml
	db/schema.rb
	spec/lib/open_food_web/group_buy_report_spec.rb
This commit is contained in:
Rohan Mitchell
2012-11-01 11:02:02 +11:00
parent 13d6f7213e f8c2c8bbed
commit 6d84cf7613
23 changed files with 945 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/requests/admin/product_spec.rb
View File

@@ -49,14 +49,14 @@ feature %q{
fill_in 'product_price', :with => '19.99'
select 'New supplier', :from => 'product_supplier_id'
choose 'product_group_buy_1'
fill_in 'Group buy unit size', :with => '10 kg'
fill_in 'Group buy unit size', :with => '10'
click_button 'Create'
flash_message.should == 'Product "A new product !!!" has been successfully created!'
product = Spree::Product.find_by_name('A new product !!!')
product.group_buy.should be_true
product.group_buy_unit_size.should == '10 kg'
product.group_buy_unit_size.should == 10.0
end
end

24
spec/requests/admin/reports_spec.rb
View File

@@ -24,4 +24,28 @@ feature %q{
page.should have_content 'Supplier'
end
scenario "bulk co-op report" do
login_to_admin_section
click_link 'Reports'
click_link 'Bulk Co-Op'
page.should have_content 'Supplier'
end
scenario "payments reports" do
login_to_admin_section
click_link 'Reports'
click_link 'Payment Reports'
page.should have_content 'Payment State'
end
scenario "order cycle reports" do
login_to_admin_section
click_link 'Reports'
click_link 'Order Cycle Reports'
page.should have_content 'Supplier'
end
end