raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix reports taxons and specs

Browse Source
This commit is contained in:
Rafael Schouten
2014-10-25 18:51:03 +11:00
parent 6f1c90ea25
commit feff4fd46f
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/open_food_network/products_and_inventory_report.rb
View File

@@ -13,7 +13,7 @@ module OpenFoodNetwork
"Producer Suburb",
"Product",
"Product Properties",
"Taxon",
"Taxons",
"Variant Value",
"Price",
"Group Buy Unit Quantity",

8
spec/features/admin/reports_spec.rb
View File

@@ -157,10 +157,10 @@ feature %q{
table = rows.map { |r| r.all("th,td").map { |c| c.text.strip } }
table.sort.should == [
["Supplier", "Producer Suburb", "Product", "Product Properties", "Variant Value", "Price", "Group Buy Unit Quantity", "Amount"],
[product_1.supplier.name, product_1.supplier.address.city, "Product Name", product_1.properties.join(", "), "Test", "100.0", product_1.group_buy_unit_size.to_s, ""],
[product_1.supplier.name, product_1.supplier.address.city, "Product Name", product_1.properties.join(", "), "S", "80.0", product_1.group_buy_unit_size.to_s, ""],
[product_2.supplier.name, product_1.supplier.address.city, "Product 2", product_1.properties.join(", "), "", "99.0", product_1.group_buy_unit_size.to_s, ""]
["Supplier", "Producer Suburb", "Product", "Product Properties", "Taxons", "Variant Value", "Price", "Group Buy Unit Quantity", "Amount"],
[product_1.supplier.name, product_1.supplier.address.city, "Product Name", product_1.properties.join(", "), product_1.primary_taxon.name, "Test", "100.0", product_1.group_buy_unit_size.to_s, ""],
[product_1.supplier.name, product_1.supplier.address.city, "Product Name", product_1.properties.join(", "), product_1.primary_taxon.name, "S", "80.0", product_1.group_buy_unit_size.to_s, ""],
[product_2.supplier.name, product_1.supplier.address.city, "Product 2", product_1.properties.join(", "), product_2.primary_taxon.name, "", "99.0", product_1.group_buy_unit_size.to_s, ""]
].sort
end
end

9
spec/lib/open_food_network/products_and_inventory_report_spec.rb
View File

@@ -18,7 +18,7 @@ module OpenFoodNetwork
"Producer Suburb",
"Product",
"Product Properties",
"Taxon",
"Taxons",
"Variant Value",
"Price",
"Group Buy Unit Quantity",
@@ -34,8 +34,8 @@ module OpenFoodNetwork
variant.stub_chain(:product, :supplier, :name).and_return("Supplier")
variant.stub_chain(:product, :supplier, :address, :city).and_return("A city")
variant.stub_chain(:product, :name).and_return("Product Name")
variant.stub_chain(:product, :properties).and_return [double(name: "test"), double(name: "foo")]
variant.stub_chain(:product, :taxons).and_return [double(name: "test"), double(name: "foo")]
variant.stub_chain(:product, :properties).and_return [double(name: "property1"), double(name: "property2")]
variant.stub_chain(:product, :taxons).and_return [double(name: "taxon1"), double(name: "taxon2")]
variant.stub_chain(:product, :group_buy_unit_size).and_return(21)
subject.stub(:variants).and_return [variant]
@@ -43,7 +43,8 @@ module OpenFoodNetwork
"Supplier",
"A city",
"Product Name",
"test, foo",
"property1, property2",
"taxon1, taxon2",
"Variant Name",
100,
21,