Fix problem in order factory

We dont need the global zone
openfoodfoundation · Aug 23, 2020 · ee158e8 · ee158e8
1 parent f627741
commit ee158e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/spec/factories/order_factory.rb b/spec/factories/order_factory.rb
@@ -123,20 +123,19 @@
       product_price 0
       tax_rate_amount 0
       tax_rate_name ""
+      zone { create(:zone_with_member) }
     end
 
     distributor { create(:distributor_enterprise) }
     order_cycle { create(:simple_order_cycle) }
 
     after(:create) do |order, proxy|
       order.distributor.update_attribute(:charges_sales_tax, true)
-      Spree::Zone.global.update_attribute(:default_tax, true)
-
-      p = FactoryBot.create(:taxed_product, zone: Spree::Zone.global,
-                                            price: proxy.product_price,
-                                            tax_rate_amount: proxy.tax_rate_amount,
-                                            tax_rate_name: proxy.tax_rate_name)
-      FactoryBot.create(:line_item, order: order, product: p, price: p.price)
+      product = FactoryBot.create(:taxed_product, zone: zone,
+                                                  price: proxy.product_price,
+                                                  tax_rate_amount: proxy.tax_rate_amount,
+                                                  tax_rate_name: proxy.tax_rate_name)
+      FactoryBot.create(:line_item, order: order, product: product, price: product.price)
       order.reload
     end
   end

diff --git a/spec/services/tax_rate_finder_spec.rb b/spec/services/tax_rate_finder_spec.rb
@@ -6,11 +6,10 @@
     let(:included_tax) { BigDecimal(20) }
     let(:tax_rate) { create_rate(0.2) }
     let(:tax_category) { create(:tax_category, tax_rates: [tax_rate]) }
-    # This zone is used by :order_with_taxes and needs to match it
-    let(:zone) { create(:zone, name: "GlobalZone") }
+    let(:zone) { create(:zone_with_member) }
     let(:shipment) { create(:shipment) }
     let(:enterprise_fee) { create(:enterprise_fee, tax_category: tax_category) }
-    let(:order) { create(:order_with_taxes) }
+    let(:order) { create(:order_with_taxes, zone: zone) }
 
     it "finds the tax rate of a shipping fee" do
       rates = TaxRateFinder.new.tax_rates(