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

Merge branch 'using-simple-order-cycle'

Browse Source
This commit is contained in:
Rohan Mitchell
2014-12-03 12:08:25 +11:00
parent 3358fb3d73 fbef139fc5
commit bd7253bdda
7 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spec/controllers/api/order_cycles_controller_spec.rb
View File

@@ -6,8 +6,8 @@ module Api
include Spree::Api::TestingSupport::Helpers
render_views
let!(:oc1) { FactoryGirl.create(:order_cycle) }
let!(:oc2) { FactoryGirl.create(:order_cycle) }
let!(:oc1) { FactoryGirl.create(:simple_order_cycle) }
let!(:oc2) { FactoryGirl.create(:simple_order_cycle) }
let(:coordinator) { oc1.coordinator }
let(:attributes) { [:id, :name, :suppliers, :distributors] }
@@ -70,7 +70,7 @@ module Api
user.save!
user
end
let!(:order_cycle) { create(:order_cycle, suppliers: [oc_supplier], distributors: [oc_distributor]) }
let!(:order_cycle) { create(:simple_order_cycle, suppliers: [oc_supplier], distributors: [oc_distributor]) }
context "as the user of a supplier to an order cycle" do
before :each do

2
spec/controllers/checkout_controller_spec.rb
View File

@@ -2,7 +2,7 @@ require 'spec_helper'
describe CheckoutController do
let(:distributor) { double(:distributor) }
let(:order_cycle) { create(:order_cycle) }
let(:order_cycle) { create(:simple_order_cycle) }
let(:order) { create(:order) }
before do
order.stub(:checkout_allowed?).and_return true

26
spec/controllers/shop_controller_spec.rb
View File

@@ -16,21 +16,21 @@ describe ShopController do
describe "Selecting order cycles" do
it "should select an order cycle when only one order cycle is open" do
oc1 = create(:order_cycle, distributors: [d])
oc1 = create(:simple_order_cycle, distributors: [d])
spree_get :show
controller.current_order_cycle.should == oc1
end
it "should not set an order cycle when multiple order cycles are open" do
oc1 = create(:order_cycle, distributors: [d])
oc2 = create(:order_cycle, distributors: [d])
oc1 = create(:simple_order_cycle, distributors: [d])
oc2 = create(:simple_order_cycle, distributors: [d])
spree_get :show
controller.current_order_cycle.should == nil
end
it "should allow the user to post to select the current order cycle" do
oc1 = create(:order_cycle, distributors: [d])
oc2 = create(:order_cycle, distributors: [d])
oc1 = create(:simple_order_cycle, distributors: [d])
oc2 = create(:simple_order_cycle, distributors: [d])
spree_post :order_cycle, order_cycle_id: oc2.id
response.should be_success
@@ -40,8 +40,8 @@ describe ShopController do
context "RABL tests" do
render_views
it "should return the order cycle details when the oc is selected" do
oc1 = create(:order_cycle, distributors: [d])
oc2 = create(:order_cycle, distributors: [d])
oc1 = create(:simple_order_cycle, distributors: [d])
oc2 = create(:simple_order_cycle, distributors: [d])
spree_post :order_cycle, order_cycle_id: oc2.id
response.should be_success
@@ -49,7 +49,7 @@ describe ShopController do
end
it "should return the current order cycle when hit with GET" do
oc1 = create(:order_cycle, distributors: [d])
oc1 = create(:simple_order_cycle, distributors: [d])
controller.stub(:current_order_cycle).and_return oc1
spree_get :order_cycle
response.body.should have_content oc1.id
@@ -57,9 +57,9 @@ describe ShopController do
end
it "should not allow the user to select an invalid order cycle" do
oc1 = create(:order_cycle, distributors: [d])
oc2 = create(:order_cycle, distributors: [d])
oc3 = create(:order_cycle, distributors: [create(:distributor_enterprise)])
oc1 = create(:simple_order_cycle, distributors: [d])
oc2 = create(:simple_order_cycle, distributors: [d])
oc3 = create(:simple_order_cycle, distributors: [create(:distributor_enterprise)])
spree_post :order_cycle, order_cycle_id: oc3.id
response.status.should == 404
@@ -71,7 +71,7 @@ describe ShopController do
describe "producers/suppliers" do
let(:supplier) { create(:supplier_enterprise) }
let(:product) { create(:product, supplier: supplier) }
let(:order_cycle) { create(:order_cycle, distributors: [d], coordinator: create(:distributor_enterprise)) }
let(:order_cycle) { create(:simple_order_cycle, distributors: [d], coordinator: create(:distributor_enterprise)) }
before do
exchange = Exchange.find(order_cycle.exchanges.to_enterprises(d).outgoing.first.id)
@@ -81,7 +81,7 @@ describe ShopController do
describe "returning products" do
let(:product) { create(:product) }
let(:order_cycle) { create(:order_cycle, distributors: [d], coordinator: create(:distributor_enterprise)) }
let(:order_cycle) { create(:simple_order_cycle, distributors: [d], coordinator: create(:distributor_enterprise)) }
let(:exchange) { Exchange.find(order_cycle.exchanges.to_enterprises(d).outgoing.first.id) }
before do

10
spec/features/admin/order_cycles_spec.rb
View File

@@ -360,9 +360,9 @@ feature %q{
scenario "updating many order cycle opening/closing times at once" do
# Given three order cycles
oc1 = create(:order_cycle)
oc2 = create(:order_cycle)
oc3 = create(:order_cycle)
oc1 = create(:simple_order_cycle)
oc2 = create(:simple_order_cycle)
oc3 = create(:simple_order_cycle)
# When I go to the order cycles page
login_to_admin_section
@@ -394,7 +394,7 @@ feature %q{
scenario "cloning an order cycle" do
# Given an order cycle
oc = create(:order_cycle)
oc = create(:simple_order_cycle)
# When I clone it
login_to_admin_section
@@ -625,7 +625,7 @@ feature %q{
end
it "shows me an index of order cycles without enterprise columns" do
create(:order_cycle, coordinator: enterprise)
create(:simple_order_cycle, coordinator: enterprise)
visit admin_order_cycles_path
page.should_not have_selector 'th', text: 'SUPPLIERS'
page.should_not have_selector 'th', text: 'COORDINATOR'

2
spec/features/consumer/home_spec.rb
View File

@@ -8,7 +8,7 @@ feature 'Home', js: true do
let!(:invisible_distributor) { create(:distributor_enterprise, visible: false) }
let(:d1) { create(:distributor_enterprise) }
let(:d2) { create(:distributor_enterprise) }
let!(:order_cycle) { create(:order_cycle, distributors: [distributor], coordinator: create(:distributor_enterprise)) }
let!(:order_cycle) { create(:simple_order_cycle, distributors: [distributor], coordinator: create(:distributor_enterprise)) }
let!(:producer) { create(:supplier_enterprise) }
let!(:er) { create(:enterprise_relationship, parent: distributor, child: producer) }

35
spec/models/order_cycle_spec.rb
View File

@@ -91,25 +91,25 @@ describe OrderCycle do
end
it "finds the most recently closed order cycles" do
oc1 = create(:order_cycle, orders_close_at: 2.hours.ago)
oc2 = create(:order_cycle, orders_close_at: 1.hour.ago)
oc3 = create(:order_cycle, orders_close_at: 1.hour.from_now)
oc1 = create(:simple_order_cycle, orders_close_at: 2.hours.ago)
oc2 = create(:simple_order_cycle, orders_close_at: 1.hour.ago)
oc3 = create(:simple_order_cycle, orders_close_at: 1.hour.from_now)
OrderCycle.most_recently_closed.should == [oc2, oc1]
end
it "finds the soonest opening order cycles" do
oc1 = create(:order_cycle, orders_open_at: 1.weeks.from_now)
oc2 = create(:order_cycle, orders_open_at: 2.hours.from_now)
oc3 = create(:order_cycle, orders_open_at: 1.hour.ago)
oc1 = create(:simple_order_cycle, orders_open_at: 1.weeks.from_now)
oc2 = create(:simple_order_cycle, orders_open_at: 2.hours.from_now)
oc3 = create(:simple_order_cycle, orders_open_at: 1.hour.ago)
OrderCycle.soonest_opening.should == [oc2, oc1]
end
it "finds the soonest closing order cycles" do
oc1 = create(:order_cycle, orders_close_at: 2.hours.ago)
oc2 = create(:order_cycle, orders_close_at: 2.hour.from_now)
oc3 = create(:order_cycle, orders_close_at: 1.hour.from_now)
oc1 = create(:simple_order_cycle, orders_close_at: 2.hours.ago)
oc2 = create(:simple_order_cycle, orders_close_at: 2.hour.from_now)
oc3 = create(:simple_order_cycle, orders_close_at: 1.hour.from_now)
OrderCycle.soonest_closing.should == [oc3, oc2]
end
@@ -311,7 +311,7 @@ describe OrderCycle do
end
describe "checking status" do
let(:oc) { create(:order_cycle) }
let(:oc) { create(:simple_order_cycle) }
it "reports status when an order cycle is upcoming" do
Timecop.freeze(oc.orders_open_at - 1.second) do
@@ -349,23 +349,30 @@ describe OrderCycle do
end
it "clones itself" do
oc = create(:order_cycle)
occ = oc.clone!
coordinator = create(:enterprise);
oc = create(:simple_order_cycle, coordinator_fees: [create(:enterprise_fee, enterprise: coordinator)])
ex1 = create(:exchange, order_cycle: oc)
ex2 = create(:exchange, order_cycle: oc)
oc.clone!
occ = OrderCycle.last
occ.name.should == "COPY OF #{oc.name}"
occ.orders_open_at.should be_nil
occ.orders_close_at.should be_nil
occ.coordinator.should_not be_nil
occ.coordinator.should == oc.coordinator
occ.coordinator_fee_ids.should_not be_empty
occ.coordinator_fee_ids.should == oc.coordinator_fee_ids
#(0..occ.exchanges.count).all? { |i| occ.exchanges[i].eql? oc.exchanges[i] }.should be_true
# to_h gives us a unique hash for each exchange
# check that the clone has no additional exchanges
occ.exchanges.map(&:to_h).all? do |ex|
oc.exchanges.map(&:to_h).include? ex
end
# check that the clone has original exchanges
occ.exchanges.map(&:to_h).include? ex1.to_h
occ.exchanges.map(&:to_h).include? ex2.to_h
end
describe "finding recently closed order cycles" do

8
spec/models/spree/product_spec.rb
View File

@@ -359,8 +359,8 @@ module Spree
d2 = create(:distributor_enterprise)
p1 = create(:product)
p2 = create(:product)
oc1 = create(:order_cycle, :distributors => [d1], :variants => [p1.master])
oc2 = create(:order_cycle, :distributors => [d2], :variants => [p2.master])
oc1 = create(:simple_order_cycle, :distributors => [d1], :variants => [p1.master])
oc2 = create(:simple_order_cycle, :distributors => [d2], :variants => [p2.master])
p1.should be_in_distributor d1
p1.should_not be_in_distributor d2
@@ -371,8 +371,8 @@ module Spree
d2 = create(:distributor_enterprise)
p1 = create(:product)
p2 = create(:product)
oc1 = create(:order_cycle, :distributors => [d1], :variants => [p1.master])
oc2 = create(:order_cycle, :distributors => [d2], :variants => [p2.master])
oc1 = create(:simple_order_cycle, :distributors => [d1], :variants => [p1.master])
oc2 = create(:simple_order_cycle, :distributors => [d2], :variants => [p2.master])
p1.should be_in_order_cycle oc1
p1.should_not be_in_order_cycle oc2