Hello, world!
This is a paragraph.
' email 'enterprise@example.com' @@ -101,12 +102,12 @@ FactoryGirl.define do factory :supplier_enterprise, :parent => :enterprise do is_primary_producer true - is_distributor false + sells "none" end factory :distributor_enterprise, :parent => :enterprise do is_primary_producer false - is_distributor true + sells "any" end factory :enterprise_relationship do diff --git a/spec/features/admin/enterprise_user_spec.rb b/spec/features/admin/enterprise_user_spec.rb index 77378f6cbd..fa92013a73 100644 --- a/spec/features/admin/enterprise_user_spec.rb +++ b/spec/features/admin/enterprise_user_spec.rb @@ -11,10 +11,10 @@ feature %q{ let!(:user) { create_enterprise_user } let!(:supplier1) { create(:supplier_enterprise, name: 'Supplier 1') } let!(:supplier2) { create(:supplier_enterprise, name: 'Supplier 2') } - let(:supplier_profile) { create(:supplier_enterprise, name: 'Supplier profile', type: 'profile') } + let(:supplier_profile) { create(:supplier_enterprise, name: 'Supplier profile', sells: 'none') } let!(:distributor1) { create(:distributor_enterprise, name: 'Distributor 3') } let!(:distributor2) { create(:distributor_enterprise, name: 'Distributor 4') } - let(:distributor_profile) { create(:distributor_enterprise, name: 'Distributor profile', type: 'profile') } + let(:distributor_profile) { create(:distributor_enterprise, name: 'Distributor profile', sells: 'none') } describe "creating an enterprise user" do context "with a limitted number of owned enterprises" do diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb index abaab5cd2d..b97e7600c4 100644 --- a/spec/features/admin/enterprises_spec.rb +++ b/spec/features/admin/enterprises_spec.rb @@ -16,7 +16,7 @@ feature %q{ within("tr.enterprise-#{s.id}") do expect(page).to have_content s.name - expect(page).to have_select "enterprise_set_collection_attributes_1_type" + expect(page).to have_select "enterprise_set_collection_attributes_1_sells" expect(page).to have_content "Edit Profile" expect(page).to have_content "Delete" expect(page).to_not have_content "Payment Methods" @@ -26,7 +26,7 @@ feature %q{ within("tr.enterprise-#{d.id}") do expect(page).to have_content d.name - expect(page).to have_select "enterprise_set_collection_attributes_0_type" + expect(page).to have_select "enterprise_set_collection_attributes_0_sells" expect(page).to have_content "Edit Profile" expect(page).to have_content "Delete" expect(page).to have_content "Payment Methods" @@ -37,7 +37,7 @@ feature %q{ scenario "editing enterprises in bulk" do s = create(:supplier_enterprise) - d = create(:distributor_enterprise, type: 'profile') + d = create(:distributor_enterprise, sells: 'none') d_manager = create_enterprise_user d_manager.enterprise_roles.build(enterprise: d).save expect(d.owner).to_not eq d_manager @@ -48,14 +48,14 @@ feature %q{ within("tr.enterprise-#{d.id}") do expect(page).to have_checked_field "enterprise_set_collection_attributes_0_visible" uncheck "enterprise_set_collection_attributes_0_visible" - select 'full', from: "enterprise_set_collection_attributes_0_type" + select 'any', from: "enterprise_set_collection_attributes_0_sells" select d_manager.email, from: 'enterprise_set_collection_attributes_0_owner_id' end click_button "Update" flash_message.should == 'Enterprises updated successfully' distributor = Enterprise.find(d.id) expect(distributor.visible).to eq false - expect(distributor.type).to eq 'full' + expect(distributor.sells).to eq 'any' expect(distributor.owner).to eq d_manager end @@ -82,15 +82,16 @@ feature %q{ click_link 'New Enterprise' # Checking shipping and payment method sidebars work + choose "Any" uncheck 'enterprise_is_primary_producer' - check 'enterprise_is_distributor' + page.should_not have_checked_field "enterprise_payment_method_ids_#{payment_method.id}" page.should_not have_checked_field "enterprise_shipping_method_ids_#{shipping_method.id}" # Filling in details fill_in 'enterprise_name', :with => 'Eaterprises' select2_search admin.email, from: 'Owner' - choose 'Full' + choose 'Any' check "enterprise_payment_method_ids_#{payment_method.id}" check "enterprise_shipping_method_ids_#{shipping_method.id}" select2_search eg1.name, from: 'Groups' @@ -134,18 +135,20 @@ feature %q{ end fill_in 'enterprise_name', :with => 'Eaterprises' - choose 'Single' + choose 'Own' select2_search user.email, from: 'Owner' fill_in 'enterprise_description', :with => 'Connecting farmers and eaters' fill_in 'enterprise_long_description', :with => 'Zombie ipsum reversus ab viral inferno, nam rick grimes malum cerebro.' # Check Angularjs switching of sidebar elements uncheck 'enterprise_is_primary_producer' - uncheck 'enterprise_is_distributor' - page.should have_selector "#payment_methods", visible: false - page.should have_selector "#shipping_methods", visible: false - page.should have_selector "#enterprise_fees", visible: false - check 'enterprise_is_distributor' + #TODO something needed here ? sells=any? not sure what js is_distributor was connected to + # uncheck 'enterprise_is_distributor' + # page.should have_selector "#payment_methods", visible: false + # page.should have_selector "#shipping_methods", visible: false + # page.should have_selector "#enterprise_fees", visible: false + #TODO something needed here ? sells=any? not sure what js is_distributor was connected to + # check 'enterprise_is_distributor' page.should have_selector "#payment_methods" page.should have_selector "#shipping_methods" page.should have_selector "#enterprise_fees" @@ -275,16 +278,18 @@ feature %q{ within("tr.enterprise-#{distributor1.id}") do expect(page).to have_content distributor1.name - expect(page).to have_checked_field "enterprise_set_collection_attributes_0_is_distributor" + # TODO expect sell= ? + # expect(page).to have_checked_field "enterprise_set_collection_attributes_0_is_distributor" expect(page).to have_unchecked_field "enterprise_set_collection_attributes_0_is_primary_producer" - expect(page).to_not have_select "enterprise_set_collection_attributes_0_type" + expect(page).to_not have_select "enterprise_set_collection_attributes_0_sells" end within("tr.enterprise-#{supplier1.id}") do expect(page).to have_content supplier1.name - expect(page).to have_unchecked_field "enterprise_set_collection_attributes_1_is_distributor" + # TODO expect sells= ? + # expect(page).to have_unchecked_field "enterprise_set_collection_attributes_1_is_distributor" expect(page).to have_checked_field "enterprise_set_collection_attributes_1_is_primary_producer" - expect(page).to_not have_select "enterprise_set_collection_attributes_1_type" + expect(page).to_not have_select "enterprise_set_collection_attributes_1_sells" end expect(page).to_not have_content "supplier2.name" diff --git a/spec/features/consumer/registration_spec.rb b/spec/features/consumer/registration_spec.rb index 7ac46a8970..5ed9c59fcb 100644 --- a/spec/features/consumer/registration_spec.rb +++ b/spec/features/consumer/registration_spec.rb @@ -49,7 +49,7 @@ feature "Registration", js: true do expect(page).to have_content 'Nice one!' e = Enterprise.find_by_name('My Awesome Enterprise') expect(e.address.address1).to eq "123 Abc Street" - expect(e.is_distributor).to eq true + expect(e.sells).to eq "none" expect(e.is_primary_producer).to eq true expect(e.contact).to eq "Saskia Munroe" diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb index 56c578f91b..d4db6bff29 100644 --- a/spec/features/consumer/shopping/shopping_spec.rb +++ b/spec/features/consumer/shopping/shopping_spec.rb @@ -167,7 +167,7 @@ feature "As a consumer I want to shop with a distributor", js: true do visit shop_path end - it "should save group buy data to ze cart" do + it "should save group buy data to the cart" do fill_in "variants[#{variant.id}]", with: 6 fill_in "variant_attributes[#{variant.id}][max_quantity]", with: 7 page.should have_in_cart product.name diff --git a/spec/models/enterprise_spec.rb b/spec/models/enterprise_spec.rb index 68067b5ac5..8f9a57f64c 100644 --- a/spec/models/enterprise_spec.rb +++ b/spec/models/enterprise_spec.rb @@ -502,64 +502,37 @@ describe Enterprise do end end - pending "provide enterprise category" do + describe "provide enterprise category" do - # Swap type values full > sell_all, single > sell_own profile > sell_none - # swap is_distributor for new can_supply flag. - let(:producer_sell_all_can_supply) { - create(:enterprise, is_primary_producer: true, type: "full", is_distributor: true) + let(:producer_sell_all) { + create(:enterprise, is_primary_producer: true, sells: "any") } - let(:producer_sell_all_cant_supply) { - create(:enterprise, is_primary_producer: true, type: "full", is_distributor: false) + let(:producer_sell_own) { + create(:enterprise, is_primary_producer: true, sells: "own") } - let(:producer_sell_own_can_supply) { - create(:enterprise, is_primary_producer: true, type: "single", is_distributor: true) + let(:producer_sell_none) { + create(:enterprise, is_primary_producer: true, sells: "none") } - let(:producer_sell_own_cant_supply) { - create(:enterprise, is_primary_producer: true, type: "single", is_distributor: false) + let(:non_producer_sell_all) { + create(:enterprise, is_primary_producer: false, sells: "any") } - let(:producer_sell_none_can_supply) { - create(:enterprise, is_primary_producer: true, type: "profile", is_distributor: true) + let(:non_producer_sell_own) { + create(:enterprise, is_primary_producer: false, sells: "own") } - let(:producer_sell_none_cant_supply) { - create(:enterprise, is_primary_producer: true, type: "profile", is_distributor: false) - } - let(:non_producer_sell_all_can_supply) { - create(:enterprise, is_primary_producer: true, type: "full", is_distributor: true) - } - let(:non_producer_sell_all_cant_supply) { - create(:enterprise, is_primary_producer: true, type: "full", is_distributor: false) - } - let(:non_producer_sell_own_can_supply) { - create(:enterprise, is_primary_producer: true, type: "single", is_distributor: true) - } - let(:non_producer_sell_own_cant_supply) { - create(:enterprise, is_primary_producer: true, type: "single", is_distributor: false) - } - let(:non_producer_sell_none_can_supply) { - create(:enterprise, is_primary_producer: false, type: "profile", is_distributor: true) - } - let(:non_producer_sell_none_cant_supply) { - create(:enterprise, is_primary_producer: false, type: "profile", is_distributor: false) + let(:non_producer_sell_none) { + create(:enterprise, is_primary_producer: false, sells: "none") } it "should output enterprise categories" do - producer_sell_all_can_supply.is_primary_producer.should == true - producer_sell_all_can_supply.supplies.should == true - producer_sell_all_can_supply.type.should == "full" + producer_sell_all.is_primary_producer.should == true + producer_sell_all.sells.should == "any" - producer_sell_all_can_supply.enterprise_category.should == "producer_hub" - producer_sell_all_cant_supply.enterprise_category.should == "producer_hub" - producer_sell_own_can_supply.enterprise_category.should == "producer_shop" - producer_sell_own_cant_supply.enterprise_category.should == "producer_shop" - producer_sell_none_can_supply.enterprise_category.should == "producer" - producer_sell_none_cant_supply.enterprise_category.should == "producer_profile" - non_producer_sell_all_can_supply.enterprise_category.should == "hub" - non_producer_sell_all_cant_supply.enterprise_category.should == "hub" - non_producer_sell_own_can_supply.enterprise_category.should == "hub" - non_producer_sell_own_cant_supply.enterprise_category.should == "hub" - non_producer_sell_none_can_supply.enterprise_category.should == "hub_profile" - non_producer_sell_none_cant_supply.enterprise_category.should == "hub_profile" + producer_sell_all.enterprise_category.should == "producer_hub" + producer_sell_own.enterprise_category.should == "producer_shop" + producer_sell_none.enterprise_category.should == "producer" + non_producer_sell_all.enterprise_category.should == "hub" + non_producer_sell_own.enterprise_category.should == "hub" + non_producer_sell_none.enterprise_category.should == "hub_profile" end end end diff --git a/spec/models/order_cycle_spec.rb b/spec/models/order_cycle_spec.rb index 9785d5ed2d..56aa51a0d0 100644 --- a/spec/models/order_cycle_spec.rb +++ b/spec/models/order_cycle_spec.rb @@ -44,8 +44,8 @@ describe OrderCycle do end it "finds order cycles accessible by a user" do - e1 = create(:enterprise, is_primary_producer: true, is_distributor: true) - e2 = create(:enterprise, is_primary_producer: true, is_distributor: true) + e1 = create(:enterprise, is_primary_producer: true, sells: "any") + e2 = create(:enterprise, is_primary_producer: true, sells: "any") user = create(:user, enterprises: [e2], spree_roles: []) user.spree_roles = []