raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-04 02:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2578 from luisramos0/spree2_fix_test_line_items

Browse Source 
Spree2 fix test line items
This commit is contained in:
Maikel
2018-08-31 13:26:25 +10:00
committed by GitHub
parent 189bd0911b efcf680094
commit 42936be40a
12 changed files with 68 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spec/controllers/admin/bulk_line_items_controller_spec.rb
View File

@@ -11,13 +11,10 @@ describe Admin::BulkLineItemsController, type: :controller do
let!(:order1) { FactoryBot.create(:order, state: 'complete', completed_at: 1.day.ago, distributor: dist1, billing_address: FactoryBot.create(:address) ) }
let!(:order2) { FactoryBot.create(:order, state: 'complete', completed_at: Time.zone.now, distributor: dist1, billing_address: FactoryBot.create(:address) ) }
let!(:order3) { FactoryBot.create(:order, state: 'complete', completed_at: Time.zone.now, distributor: dist1, billing_address: FactoryBot.create(:address) ) }
let(:shipment1) { FactoryBot.create(:shipment, order:order1) }
let(:shipment2) { FactoryBot.create(:shipment, order:order2) }
let(:shipment3) { FactoryBot.create(:shipment, order:order3) }
let!(:line_item1) { FactoryBot.create(:line_item, order: order1, target_shipment: shipment1) }
let!(:line_item2) { FactoryBot.create(:line_item, order: order2, target_shipment: shipment2) }
let!(:line_item3) { FactoryBot.create(:line_item, order: order2, target_shipment: shipment2) }
let!(:line_item4) { FactoryBot.create(:line_item, order: order3, target_shipment: shipment3) }
let!(:line_item1) { FactoryBot.create(:line_item_with_shipment, order: order1) }
let!(:line_item2) { FactoryBot.create(:line_item_with_shipment, order: order2) }
let!(:line_item3) { FactoryBot.create(:line_item_with_shipment, order: order2) }
let!(:line_item4) { FactoryBot.create(:line_item_with_shipment, order: order3) }
context "as a normal user" do
before { controller.stub spree_current_user: create_enterprise_user }
@@ -86,12 +83,10 @@ describe Admin::BulkLineItemsController, type: :controller do
let(:coordinator) { create(:distributor_enterprise) }
let(:order_cycle) { create(:simple_order_cycle, coordinator: coordinator) }
let!(:order1) { FactoryBot.create(:order, order_cycle: order_cycle, state: 'complete', completed_at: Time.zone.now, distributor: distributor1, billing_address: FactoryBot.create(:address) ) }
let(:shipment1) { FactoryBot.create(:shipment, order:order1) }
let(:shipment2) { FactoryBot.create(:shipment, order:order2) }
let!(:line_item1) { FactoryBot.create(:line_item, order: order1, target_shipment: shipment1, product: FactoryBot.create(:product, supplier: supplier)) }
let!(:line_item2) { FactoryBot.create(:line_item, order: order1, target_shipment: shipment1, product: FactoryBot.create(:product, supplier: supplier)) }
let!(:line_item1) { FactoryBot.create(:line_item_with_shipment, order: order1, product: FactoryBot.create(:product, supplier: supplier)) }
let!(:line_item2) { FactoryBot.create(:line_item_with_shipment, order: order1, product: FactoryBot.create(:product, supplier: supplier)) }
let!(:order2) { FactoryBot.create(:order, order_cycle: order_cycle, state: 'complete', completed_at: Time.zone.now, distributor: distributor2, billing_address: FactoryBot.create(:address) ) }
let!(:line_item3) { FactoryBot.create(:line_item, order: order2, target_shipment: shipment2, product: FactoryBot.create(:product, supplier: supplier)) }
let!(:line_item3) { FactoryBot.create(:line_item_with_shipment, order: order2, product: FactoryBot.create(:product, supplier: supplier)) }
context "producer enterprise" do
before do
@@ -136,10 +131,9 @@ describe Admin::BulkLineItemsController, type: :controller do
let(:coordinator) { create(:distributor_enterprise) }
let(:order_cycle) { create(:simple_order_cycle, coordinator: coordinator) }
let!(:order1) { FactoryBot.create(:order, order_cycle: order_cycle, state: 'complete', completed_at: Time.zone.now, distributor: distributor1, billing_address: FactoryBot.create(:address) ) }
let(:shipment1) { FactoryBot.create(:shipment, order:order1) }
let!(:line_item1) {
line_item1 = FactoryBot.create(:line_item, order: order1, target_shipment: shipment1, product: FactoryBot.create(:product, supplier: supplier))
# make sure target_shipment is available through db reloads of this line_item
line_item1 = FactoryBot.create(:line_item_with_shipment, order: order1, product: FactoryBot.create(:product, supplier: supplier))
# make sure shipment is available through db reloads of this line_item
line_item1.tap(&:save!)
}
let(:line_item_params) { { quantity: 3, final_weight_volume: 3000, price: 3.00 } }
@@ -237,8 +231,7 @@ describe Admin::BulkLineItemsController, type: :controller do
let(:coordinator) { create(:distributor_enterprise) }
let(:order_cycle) { create(:simple_order_cycle, coordinator: coordinator) }
let!(:order1) { FactoryBot.create(:order, order_cycle: order_cycle, state: 'complete', completed_at: Time.zone.now, distributor: distributor1, billing_address: FactoryBot.create(:address) ) }
let(:shipment1) { FactoryBot.create(:shipment, order:order1) }
let!(:line_item1) { FactoryBot.create(:line_item, order: order1, target_shipment: shipment1, product: FactoryBot.create(:product, supplier: supplier)) }
let!(:line_item1) { FactoryBot.create(:line_item_with_shipment, order: order1, product: FactoryBot.create(:product, supplier: supplier)) }
let(:params) { { id: line_item1.id, order_id: order1.number } }
before do

2
spec/controllers/spree/admin/line_items_controller_spec.rb
View File

@@ -26,7 +26,7 @@ describe Spree::Admin::LineItemsController, type: :controller do
let(:coordinator) { create(:distributor_enterprise) }
let(:order_cycle) { create(:simple_order_cycle, coordinator: coordinator) }
let!(:order1) { FactoryBot.create(:order, order_cycle: order_cycle, state: 'complete', completed_at: Time.zone.now, distributor: distributor1, billing_address: FactoryBot.create(:address) ) }
let!(:line_item1) { FactoryBot.create(:line_item, order: order1, product: FactoryBot.create(:product, supplier: supplier)) }
let!(:line_item1) { FactoryBot.create(:line_item_with_shipment, order: order1, product: FactoryBot.create(:product, supplier: supplier)) }
let(:line_item_params) { { quantity: 3, final_weight_volume: 3000, price: 3.00 } }
let(:params) { { id: line_item1.id, order_id: order1.number, line_item: line_item_params } }

14
spec/controllers/spree/admin/orders_controller_spec.rb
View File

@@ -39,10 +39,10 @@ describe Spree::Admin::OrdersController, type: :controller do
let!(:order1) { FactoryBot.create(:order, state: 'complete', completed_at: Time.zone.now, distributor: dist1, billing_address: FactoryBot.create(:address) ) }
let!(:order2) { FactoryBot.create(:order, state: 'complete', completed_at: Time.zone.now, distributor: dist1, billing_address: FactoryBot.create(:address) ) }
let!(:order3) { FactoryBot.create(:order, state: 'complete', completed_at: Time.zone.now, distributor: dist1, billing_address: FactoryBot.create(:address) ) }
let!(:line_item1) { FactoryBot.create(:line_item, order: order1) }
let!(:line_item2) { FactoryBot.create(:line_item, order: order2) }
let!(:line_item3) { FactoryBot.create(:line_item, order: order2) }
let!(:line_item4) { FactoryBot.create(:line_item, order: order3) }
let!(:line_item1) { FactoryBot.create(:line_item_with_shipment, order: order1) }
let!(:line_item2) { FactoryBot.create(:line_item_with_shipment, order: order2) }
let!(:line_item3) { FactoryBot.create(:line_item_with_shipment, order: order2) }
let!(:line_item4) { FactoryBot.create(:line_item_with_shipment, order: order3) }
let(:line_item_attributes) { [:id, :quantity, :max_quantity, :supplier, :units_product, :units_variant] }
end
@@ -96,10 +96,10 @@ describe Spree::Admin::OrdersController, type: :controller do
let(:coordinator) { create(:distributor_enterprise) }
let(:order_cycle) { create(:simple_order_cycle, coordinator: coordinator) }
let!(:order1) { FactoryBot.create(:order, order_cycle: order_cycle, state: 'complete', completed_at: Time.zone.now, distributor: distributor1, billing_address: FactoryBot.create(:address) ) }
let!(:line_item1) { FactoryBot.create(:line_item, order: order1, product: FactoryBot.create(:product, supplier: supplier)) }
let!(:line_item2) { FactoryBot.create(:line_item, order: order1, product: FactoryBot.create(:product, supplier: supplier)) }
let!(:line_item1) { FactoryBot.create(:line_item_with_shipment, order: order1, product: FactoryBot.create(:product, supplier: supplier)) }
let!(:line_item2) { FactoryBot.create(:line_item_with_shipment, order: order1, product: FactoryBot.create(:product, supplier: supplier)) }
let!(:order2) { FactoryBot.create(:order, order_cycle: order_cycle, state: 'complete', completed_at: Time.zone.now, distributor: distributor2, billing_address: FactoryBot.create(:address) ) }
let!(:line_item3) { FactoryBot.create(:line_item, order: order2, product: FactoryBot.create(:product, supplier: supplier)) }
let!(:line_item3) { FactoryBot.create(:line_item_with_shipment, order: order2, product: FactoryBot.create(:product, supplier: supplier)) }
context "producer enterprise" do

2
spec/controllers/spree/api/line_items_controller_spec.rb
View File

@@ -13,7 +13,7 @@ module Spree
sign_in_as_admin!
let(:order) { FactoryBot.create(:order, state: 'complete', completed_at: Time.zone.now) }
let(:line_item) { FactoryBot.create(:line_item, order: order, final_weight_volume: 500) }
let(:line_item) { FactoryBot.create(:line_item_with_shipment, order: order,final_weight_volume: 500) }
context "as a line item is updated" do
before { allow(controller).to receive(:order) { order } }

4
spec/factories.rb
View File

@@ -356,6 +356,10 @@ FactoryBot.define do
end
end
factory :line_item_with_shipment, parent: :line_item do
target_shipment { create(:shipment, order: order) }
end
factory :zone_with_member, :parent => :zone do
default_tax true

42
spec/features/admin/bulk_order_management_spec.rb
View File

@@ -21,8 +21,8 @@ feature %q{
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:o2) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:o3) { create(:order_with_distributor, state: 'address', completed_at: nil ) }
let!(:li1) { create(:line_item, order: o1 ) }
let!(:li2) { create(:line_item, order: o2 ) }
let!(:li1) { create(:line_item_with_shipment, order: o1) }
let!(:li2) { create(:line_item_with_shipment, order: o2) }
let!(:li3) { create(:line_item, order: o3 ) }
before :each do
@@ -39,8 +39,8 @@ feature %q{
context "displaying individual columns" do
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now, bill_address: create(:address) ) }
let!(:o2) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now, bill_address: nil ) }
let!(:li1) { create(:line_item, order: o1 ) }
let!(:li2) { create(:line_item, order: o2, product: create(:product_with_option_types) ) }
let!(:li1) { create(:line_item_with_shipment, order: o1) }
let!(:li2) { create(:line_item_with_shipment, order: o2, product: create(:product_with_option_types) ) }
before :each do
visit '/admin/orders/bulk_management'
@@ -86,8 +86,8 @@ feature %q{
describe "sorting of line items" do
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now) }
let!(:o2) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now) }
let!(:li1) { create(:line_item, order: o1) }
let!(:li2) { create(:line_item, order: o2) }
let!(:li1) { create(:line_item_with_shipment, order: o1) }
let!(:li2) { create(:line_item_with_shipment, order: o2) }
before do
visit spree.admin_bulk_order_management_path
@@ -125,7 +125,7 @@ feature %q{
context "tracking changes" do
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:li1) { create(:line_item, order: o1, :quantity => 5 ) }
let!(:li1) { create(:line_item_with_shipment, order: o1, :quantity => 5 ) }
before :each do
visit '/admin/orders/bulk_management'
@@ -140,7 +140,7 @@ feature %q{
context "submitting data to the server" do
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:li1) { create(:line_item, order: o1, :quantity => 5 ) }
let!(:li1) { create(:line_item_with_shipment, order: o1, :quantity => 5 ) }
before :each do
li1.variant.update_attributes(on_hand: 1, on_demand: false)
@@ -182,7 +182,7 @@ feature %q{
let!(:p1) { create(:product_with_option_types, group_buy: true, group_buy_unit_size: 5000, variant_unit: "weight", variants: [create(:variant, unit_value: 1000)] ) }
let!(:v1) { p1.variants.first }
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:li1) { create(:line_item, order: o1, variant: v1, :quantity => 5, :final_weight_volume => 1000, price: 10.00 ) }
let!(:li1) { create(:line_item_with_shipment, order: o1, variant: v1, :quantity => 5, :final_weight_volume => 1000, price: 10.00 ) }
before { v1.update_attribute(:on_hand, 100)}
@@ -264,7 +264,7 @@ feature %q{
let!(:s1) { create(:supplier_enterprise) }
let!(:s2) { create(:supplier_enterprise) }
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now, order_cycle: create(:simple_order_cycle) ) }
let!(:li1) { create(:line_item, order: o1, product: create(:product, supplier: s1) ) }
let!(:li1) { create(:line_item_with_shipment, order: o1, product: create(:product, supplier: s1) ) }
let!(:li2) { create(:line_item, order: o1, product: create(:product, supplier: s2) ) }
before :each do
@@ -302,7 +302,7 @@ feature %q{
let!(:d2) { create(:distributor_enterprise) }
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now, distributor: d1, order_cycle: create(:simple_order_cycle) ) }
let!(:o2) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now, distributor: d2, order_cycle: create(:simple_order_cycle) ) }
let!(:li1) { create(:line_item, order: o1 ) }
let!(:li1) { create(:line_item_with_shipment, order: o1 ) }
let!(:li2) { create(:line_item, order: o2 ) }
before :each do
@@ -341,7 +341,7 @@ feature %q{
let!(:oc2) { create(:simple_order_cycle, distributors: [distributor]) }
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now, order_cycle: oc1 ) }
let!(:o2) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now, order_cycle: oc2 ) }
let!(:li1) { create(:line_item, order: o1 ) }
let!(:li1) { create(:line_item_with_shipment, order: o1 ) }
let!(:li2) { create(:line_item, order: o2 ) }
before do
@@ -381,7 +381,7 @@ feature %q{
let!(:p2) { create(:product, supplier: s2) }
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now, distributor: d1, order_cycle: oc1 ) }
let!(:o2) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now, distributor: d2, order_cycle: oc2 ) }
let!(:li1) { create(:line_item, order: o1, product: p1 ) }
let!(:li1) { create(:line_item_with_shipment, order: o1, product: p1 ) }
let!(:li2) { create(:line_item, order: o2, product: p2 ) }
before :each do
@@ -430,7 +430,7 @@ feature %q{
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:o2) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:o3) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:li1) { create(:line_item, order: o1 ) }
let!(:li1) { create(:line_item_with_shipment, order: o1 ) }
let!(:li2) { create(:line_item, order: o2 ) }
let!(:li3) { create(:line_item, order: o3 ) }
@@ -458,7 +458,7 @@ feature %q{
let!(:o2) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.today - 7.days) }
let!(:o3) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now.end_of_day) }
let!(:o4) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now.end_of_day + 1.second) }
let!(:li1) { create(:line_item, order: o1, :quantity => 1 ) }
let!(:li1) { create(:line_item_with_shipment, order: o1, :quantity => 1 ) }
let!(:li2) { create(:line_item, order: o2, :quantity => 2 ) }
let!(:li3) { create(:line_item, order: o3, :quantity => 3 ) }
let!(:li4) { create(:line_item, order: o4, :quantity => 4 ) }
@@ -528,7 +528,7 @@ feature %q{
context "bulk action controls" do
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:o2) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:li1) { create(:line_item, order: o1 ) }
let!(:li1) { create(:line_item_with_shipment, order: o1 ) }
let!(:li2) { create(:line_item, order: o2 ) }
before :each do
@@ -595,7 +595,7 @@ feature %q{
context "using edit buttons" do
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:o2) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:li1) { create(:line_item, order: o1 ) }
let!(:li1) { create(:line_item_with_shipment, order: o1 ) }
let!(:li2) { create(:line_item, order: o2 ) }
before :each do
@@ -629,7 +629,7 @@ feature %q{
context "using delete buttons" do
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:o2) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:li1) { create(:line_item, order: o1 ) }
let!(:li1) { create(:line_item_with_shipment, order: o1 ) }
let!(:li2) { create(:line_item, order: o2 ) }
before :each do
@@ -650,7 +650,7 @@ feature %q{
context "clicking the link on variant name" do
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:o2) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now ) }
let!(:li1) { create(:line_item, order: o1 ) }
let!(:li1) { create(:line_item_with_shipment, order: o1 ) }
let!(:li2) { create(:line_item, order: o2 ) }
let!(:p3) { create(:product_with_option_types, group_buy: true, group_buy_unit_size: 5000, variant_unit: "weight", variants: [create(:variant, unit_value: 1000)] ) }
let!(:v3) { p3.variants.first }
@@ -716,8 +716,8 @@ feature %q{
let(:d2) { create(:distributor_enterprise, name: 'Another Distributor') }
let!(:o1) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now, distributor: d1 ) }
let!(:o2) { create(:order_with_distributor, state: 'complete', completed_at: Time.zone.now, distributor: d2 ) }
let!(:line_item_distributed) { create(:line_item, order: o1, product: create(:product, supplier: s1) ) }
let!(:line_item_not_distributed) { create(:line_item, order: o2, product: create(:product, supplier: s1) ) }
let!(:line_item_distributed) { create(:line_item_with_shipment, order: o1, product: create(:product, supplier: s1) ) }
let!(:line_item_not_distributed) { create(:line_item_with_shipment, order: o2, product: create(:product, supplier: s1) ) }
before(:each) do
@enterprise_user = create_enterprise_user

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

@@ -260,8 +260,8 @@ feature %q{
Timecop.travel(Time.zone.local(2013, 4, 25, 14, 0, 0)) { order1.finalize! }
Timecop.travel(Time.zone.local(2013, 4, 25, 16, 0, 0)) { order2.finalize! }
create(:line_item, :product => product, :order => order1)
create(:line_item, :product => product, :order => order2)
create(:line_item_with_shipment, :product => product, :order => order1)
create(:line_item_with_shipment, :product => product, :order => order2)
end
it "is precise to time of day, not just date" do

20
spec/jobs/update_billable_periods_spec.rb
View File

@@ -586,16 +586,16 @@ describe UpdateBillablePeriods do
let!(:order10) { create(:order, completed_at: start_of_july + 19.days, distributor: enterprise) }
before do
order1.line_items = [ create(:line_item, price: 12.56, order: order1) ]
order2.line_items = [ create(:line_item, price: 87.44, order: order2) ]
order3.line_items = [ create(:line_item, price: 50.00, order: order3) ]
order4.line_items = [ create(:line_item, price: 73.37, order: order4) ]
order5.line_items = [ create(:line_item, price: 22.46, order: order5) ]
order6.line_items = [ create(:line_item, price: 44.85, order: order6) ]
order7.line_items = [ create(:line_item, price: 93.45, order: order7) ]
order8.line_items = [ create(:line_item, price: 59.38, order: order8) ]
order9.line_items = [ create(:line_item, price: 47.23, order: order9) ]
order10.line_items = [ create(:line_item, price: 2.35, order: order10) ]
order1.line_items = [ create(:line_item_with_shipment, price: 12.56, order: order1) ]
order2.line_items = [ create(:line_item_with_shipment, price: 87.44, order: order2) ]
order3.line_items = [ create(:line_item_with_shipment, price: 50.00, order: order3) ]
order4.line_items = [ create(:line_item_with_shipment, price: 73.37, order: order4) ]
order5.line_items = [ create(:line_item_with_shipment, price: 22.46, order: order5) ]
order6.line_items = [ create(:line_item_with_shipment, price: 44.85, order: order6) ]
order7.line_items = [ create(:line_item_with_shipment, price: 93.45, order: order7) ]
order8.line_items = [ create(:line_item_with_shipment, price: 59.38, order: order8) ]
order9.line_items = [ create(:line_item_with_shipment, price: 47.23, order: order9) ]
order10.line_items = [ create(:line_item_with_shipment, price: 2.35, order: order10) ]
[order1, order2, order3, order4, order5, order6, order7, order8, order9, order10].each(&:update!)
allow(Enterprise).to receive(:where) { double(:enterprises, select: [enterprise]) }

6
spec/lib/open_food_network/bulk_coop_report_spec.rb
View File

@@ -8,7 +8,7 @@ module OpenFoodNetwork
let(:d1) { create(:distributor_enterprise) }
let(:oc1) { create(:simple_order_cycle) }
let(:o1) { create(:order, completed_at: 1.day.ago, order_cycle: oc1, distributor: d1) }
let(:li1) { build(:line_item) }
let(:li1) { build(:line_item_with_shipment) }
before { o1.line_items << li1 }
@@ -24,7 +24,7 @@ module OpenFoodNetwork
it "does not show cancelled orders" do
o2 = create(:order, state: "canceled", completed_at: 1.day.ago)
o2.line_items << build(:line_item)
o2.line_items << build(:line_item_with_shipment)
subject.table_items.should == [li1]
end
end
@@ -80,7 +80,7 @@ module OpenFoodNetwork
d2 = create(:distributor_enterprise)
d2.enterprise_roles.create!(user: create(:user))
o2 = create(:order, distributor: d2, completed_at: 1.day.ago)
o2.line_items << build(:line_item)
o2.line_items << build(:line_item_with_shipment)
subject.table_items.should == [li1]
end

2
spec/lib/open_food_network/order_and_distributor_report_spec.rb
View File

@@ -22,7 +22,7 @@ module OpenFoodNetwork
let(:order) { create(:order, state: 'complete', completed_at: Time.zone.now, distributor: distributor, bill_address: bill_address, special_instructions: shipping_instructions) }
let(:payment_method) { create(:payment_method, distributors: [distributor]) }
let(:payment) { create(:payment, payment_method: payment_method, order: order) }
let(:line_item) { create(:line_item, product: product, order: order) }
let(:line_item) { create(:line_item_with_shipment, product: product, order: order) }
before do
order.payments << payment

8
spec/lib/open_food_network/orders_and_fulfillments_report_spec.rb
View File

@@ -8,7 +8,7 @@ module OpenFoodNetwork
let(:d1) { create(:distributor_enterprise) }
let(:oc1) { create(:simple_order_cycle) }
let(:o1) { create(:order, completed_at: 1.day.ago, order_cycle: oc1, distributor: d1) }
let(:li1) { build(:line_item) }
let(:li1) { build(:line_item_with_shipment) }
before { o1.line_items << li1 }
@@ -24,7 +24,7 @@ module OpenFoodNetwork
it "does not show cancelled orders" do
o2 = create(:order, state: "canceled", completed_at: 1.day.ago)
o2.line_items << build(:line_item)
o2.line_items << build(:line_item_with_shipment)
subject.table_items.should == [li1]
end
end
@@ -80,7 +80,7 @@ module OpenFoodNetwork
d2 = create(:distributor_enterprise)
d2.enterprise_roles.create!(user: create(:user))
o2 = create(:order, distributor: d2, completed_at: 1.day.ago)
o2.line_items << build(:line_item)
o2.line_items << build(:line_item_with_shipment)
subject.table_items.should == [li1]
end
@@ -98,7 +98,7 @@ module OpenFoodNetwork
let(:d1) { create(:distributor_enterprise) }
let(:oc1) { create(:simple_order_cycle) }
let(:o1) { create(:order, completed_at: 1.day.ago, order_cycle: oc1, distributor: d1) }
let(:li1) { build(:line_item) }
let(:li1) { build(:line_item_with_shipment) }
let(:user) { create(:admin_user)}
before { o1.line_items << li1 }

8
spec/lib/open_food_network/packing_report_spec.rb
View File

@@ -8,7 +8,7 @@ module OpenFoodNetwork
let(:d1) { create(:distributor_enterprise) }
let(:oc1) { create(:simple_order_cycle) }
let(:o1) { create(:order, completed_at: 1.day.ago, order_cycle: oc1, distributor: d1) }
let(:li1) { build(:line_item) }
let(:li1) { build(:line_item_with_shipment) }
before { o1.line_items << li1 }
@@ -24,7 +24,7 @@ module OpenFoodNetwork
it "does not show cancelled orders" do
o2 = create(:order, state: "canceled", completed_at: 1.day.ago)
o2.line_items << build(:line_item)
o2.line_items << build(:line_item_with_shipment)
subject.table_items.should == [li1]
end
end
@@ -41,7 +41,7 @@ module OpenFoodNetwork
context "that has granted P-OC to the distributor" do
let(:o2) { create(:order, distributor: d1, completed_at: 1.day.ago, bill_address: create(:address), ship_address: create(:address)) }
let(:li2) { build(:line_item, product: create(:simple_product, supplier: s1)) }
let(:li2) { build(:line_item_with_shipment, product: create(:simple_product, supplier: s1)) }
before do
o2.line_items << li2
@@ -80,7 +80,7 @@ module OpenFoodNetwork
d2 = create(:distributor_enterprise)
d2.enterprise_roles.create!(user: create(:user))
o2 = create(:order, distributor: d2, completed_at: 1.day.ago)
o2.line_items << build(:line_item)
o2.line_items << build(:line_item_with_shipment)
subject.table_items.should == [li1]
end