diff --git a/lib/open_food_network/products_and_inventory_report.rb b/lib/open_food_network/products_and_inventory_report.rb index dbf2b3db73..487ccfa67d 100644 --- a/lib/open_food_network/products_and_inventory_report.rb +++ b/lib/open_food_network/products_and_inventory_report.rb @@ -13,7 +13,7 @@ module OpenFoodNetwork "Producer Suburb", "Product", "Product Properties", - "Taxon", + "Taxons", "Variant Value", "Price", "Group Buy Unit Quantity", diff --git a/spec/features/admin/reports_spec.rb b/spec/features/admin/reports_spec.rb index 5228b4c8a0..a1f1bcfec3 100644 --- a/spec/features/admin/reports_spec.rb +++ b/spec/features/admin/reports_spec.rb @@ -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 diff --git a/spec/lib/open_food_network/products_and_inventory_report_spec.rb b/spec/lib/open_food_network/products_and_inventory_report_spec.rb index 3fd5248a50..9e449219e6 100644 --- a/spec/lib/open_food_network/products_and_inventory_report_spec.rb +++ b/spec/lib/open_food_network/products_and_inventory_report_spec.rb @@ -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,