Merge pull request #12644 from mkllnk/spec-fixes

Fix orders and distributors report after product refactor
openfoodfoundation · Jul 5, 2024 · c8cb15d · c8cb15d
2 parents 2b10862 + d602482
commit c8cb15d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/reporting/reports/orders_and_distributors/base.rb b/lib/reporting/reports/orders_and_distributors/base.rb
@@ -42,7 +42,7 @@ def query_result
         private
 
         def line_item_includes
-          [{ variant: { product: :supplier },
+          [{ variant: [:supplier, :product],
              order: [:bill_address, :payments, { distributor: :address }] }]
         end
 

diff --git a/spec/lib/reports/orders_and_distributors_report_spec.rb b/spec/lib/reports/orders_and_distributors_report_spec.rb
@@ -25,7 +25,8 @@
       let(:distributor1) { create(:distributor_enterprise) }
       let(:supplier) { create(:supplier_enterprise) }
       let(:user) { create(:admin_user) }
-      let(:product) { create(:product, supplier:) }
+      let(:product) { variant.product }
+      let(:variant) { create(:variant, supplier:) }
       let(:shipping_method) { create(:shipping_method) }
       let(:shipping_instructions) { 'pick up on thursday please!' }
       let(:order) {