From b821107c2749ebd003d6201eef2f3efbdfcd37dc Mon Sep 17 00:00:00 2001 From: Rafael Schouten Date: Sat, 27 Sep 2014 18:14:10 +1000 Subject: [PATCH] bugfix migration ad specs --- .../enterprise_controller.js.coffee | 3 +- .../templates/registration/details.html.haml | 2 +- app/views/admin/enterprises/_form.html.haml | 8 +-- .../_sidebar_enterprise_fees.html.haml | 2 +- .../_sidebar_payment_methods.html.haml | 2 +- .../_sidebar_shipping_methods.html.haml | 2 +- config/ng-test.conf.js | 7 ++ db/schema.rb | 10 +-- .../admin/enterprises_controller_spec.rb | 34 ++++----- .../admin/payment_methods_controller_spec.rb | 2 +- spec/factories.rb | 7 +- spec/features/admin/enterprise_user_spec.rb | 4 +- spec/features/admin/enterprises_spec.rb | 39 ++++++----- spec/features/consumer/registration_spec.rb | 2 +- .../consumer/shopping/shopping_spec.rb | 2 +- spec/models/enterprise_spec.rb | 69 ++++++------------- spec/models/order_cycle_spec.rb | 4 +- 17 files changed, 94 insertions(+), 105 deletions(-) diff --git a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee index c5b38191ba..a872661b27 100644 --- a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee +++ b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee @@ -3,6 +3,7 @@ angular.module("admin.enterprises") $scope.Enterprise = Enterprise.enterprise $scope.PaymentMethods = PaymentMethods.paymentMethods $scope.ShippingMethods = ShippingMethods.shippingMethods + $scope.Enterprise.sells = "none" for payment_method in $scope.PaymentMethods payment_method.selected = payment_method.id in $scope.Enterprise.payment_method_ids @@ -32,4 +33,4 @@ angular.module("admin.enterprises") $scope.ShippingMethods.reduce (count, shipping_method) -> count++ if shipping_method.selected count - , 0 \ No newline at end of file + , 0 diff --git a/app/assets/javascripts/templates/registration/details.html.haml b/app/assets/javascripts/templates/registration/details.html.haml index bb358a1864..cecf588e11 100644 --- a/app/assets/javascripts/templates/registration/details.html.haml +++ b/app/assets/javascripts/templates/registration/details.html.haml @@ -20,7 +20,7 @@ %label Choose one: .row .small-12.medium-4.large-4.columns{ 'data-equalizer-watch' => true } - %a.panel#producer-panel{ href: "#", ng: { click: "enterprise.is_distributor = false; enterprise.is_primary_producer = true", class: "{selected: (!enterprise.is_distributor && enterprise.is_primary_producer)}" } } + %a.panel#producer-panel{ href: "#", ng: { click: "enterprise.is_primary_producer = true", class: "{selected: (!enterprise.is_distributor && enterprise.is_primary_producer)}" } } .left / %render-svg{ path: "/assets/map-icon-producer.svg" } %h4 I'm A Producer diff --git a/app/views/admin/enterprises/_form.html.haml b/app/views/admin/enterprises/_form.html.haml index 8afa2750fa..0904cee944 100644 --- a/app/views/admin/enterprises/_form.html.haml +++ b/app/views/admin/enterprises/_form.html.haml @@ -32,7 +32,7 @@ .row .three.columns.alpha - %label Enterprise Type(s) + %label Primary Producer .with-tip{'data-powertip' => "Select 'Producer' if you are a primary producer of food."} %a What's this? .five.columns.omega @@ -47,15 +47,15 @@ .with-tip{'data-powertip' => "None - enterprise does not sell to customers directly.
Own - Enterprise sells own products to customers.
Any - Enterprise can sell own or other enterprises products.
"} %a What's this? .two.columns - = f.radio_button :sells, "none" + = f.radio_button :sells, "none", 'ng-model' => 'Enterprise.sells'   = f.label :sells, "None", value: "none" .two.columns - = f.radio_button :sells, "own" + = f.radio_button :sells, "own", 'ng-model' => 'Enterprise.sells'   = f.label :sells, "Own", value: "own" .four.columns.omega - = f.radio_button :sells, "any" + = f.radio_button :sells, "any", 'ng-model' => 'Enterprise.sells'   = f.label :sells, "Any", value: "any" .row diff --git a/app/views/admin/enterprises/_sidebar_enterprise_fees.html.haml b/app/views/admin/enterprises/_sidebar_enterprise_fees.html.haml index 50de7e07d9..1e73416218 100644 --- a/app/views/admin/enterprises/_sidebar_enterprise_fees.html.haml +++ b/app/views/admin/enterprises/_sidebar_enterprise_fees.html.haml @@ -1,5 +1,5 @@ - enterprise_fees_color = @enterprise_fees.count > 0 ? "blue" : "red" -.sidebar_item.four.columns.alpha#enterprise_fees{ ng: { show: 'Enterprise.is_distributor' } } +.sidebar_item.four.columns.alpha#enterprise_fees{ ng: { show: 'Enterprise.sells != "none"' } } .four.columns.alpha.header{ class: "#{enterprise_fees_color}" } %span.four.columns.alpha.centered Enterprise Fees .four.columns.alpha.list{ class: "#{enterprise_fees_color}" } diff --git a/app/views/admin/enterprises/_sidebar_payment_methods.html.haml b/app/views/admin/enterprises/_sidebar_payment_methods.html.haml index 8994c60be5..9b88dcdd13 100644 --- a/app/views/admin/enterprises/_sidebar_payment_methods.html.haml +++ b/app/views/admin/enterprises/_sidebar_payment_methods.html.haml @@ -1,4 +1,4 @@ -.sidebar_item.four.columns.alpha#payment_methods{ ng: { show: 'Enterprise.is_distributor' } } +.sidebar_item.four.columns.alpha#payment_methods{ ng: { show: 'Enterprise.sells != "none"' } } .four.columns.alpha.header{ ng: { class: "paymentMethodsColor()" } } %span.four.columns.alpha.centered Payment Methods .four.columns.alpha.list{ ng: { class: "paymentMethodsColor()" } } diff --git a/app/views/admin/enterprises/_sidebar_shipping_methods.html.haml b/app/views/admin/enterprises/_sidebar_shipping_methods.html.haml index 6d4a858366..aea1c51111 100644 --- a/app/views/admin/enterprises/_sidebar_shipping_methods.html.haml +++ b/app/views/admin/enterprises/_sidebar_shipping_methods.html.haml @@ -1,4 +1,4 @@ -.sidebar_item.four.columns.alpha#shipping_methods{ ng: { show: 'Enterprise.is_distributor' } } +.sidebar_item.four.columns.alpha#shipping_methods{ ng: { show: 'Enterprise.sells != "none"' } } .four.columns.alpha.header{ ng: { class: "shippingMethodsColor()" } } %span.four.columns.alpha.centered Shipping Methods .four.columns.alpha.list{ ng: { class: "shippingMethodsColor()" } } diff --git a/config/ng-test.conf.js b/config/ng-test.conf.js index eadaf984ae..f87aa3d48a 100644 --- a/config/ng-test.conf.js +++ b/config/ng-test.conf.js @@ -27,9 +27,16 @@ module.exports = function(config) { 'app/assets/javascripts/admin/util.js.erb' ], + preprocessors: { + '**/*.coffee': ['coffee'] + }, + coffeePreprocessor: { options: { sourceMap: true + }, + transformPath: function(path) { + return path.replace(/\.coffee$/, '.js'); } }, diff --git a/db/schema.rb b/db/schema.rb index 67084cc347..e0d47470b7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -248,8 +248,8 @@ ActiveRecord::Schema.define(:version => 20140927005043) do t.integer "address_id" t.string "pickup_times" t.string "next_collection_at" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.text "distributor_info" t.string "logo_file_name" t.string "logo_content_type" @@ -263,8 +263,10 @@ ActiveRecord::Schema.define(:version => 20140927005043) do t.string "facebook" t.string "instagram" t.string "linkedin" - t.integer "owner_id", :null => false - t.string "sells", :default => "none", :null => false + t.integer "owner_id", :null => false + t.string "sell", :default => "none", :null => false + t.string "sells", :default => "none", :null => false + t.string "type", :default => "profile", :null => false end add_index "enterprises", ["address_id"], :name => "index_enterprises_on_address_id" diff --git a/spec/controllers/admin/enterprises_controller_spec.rb b/spec/controllers/admin/enterprises_controller_spec.rb index a522624489..f0ac8639f7 100644 --- a/spec/controllers/admin/enterprises_controller_spec.rb +++ b/spec/controllers/admin/enterprises_controller_spec.rb @@ -84,28 +84,28 @@ module Admin end describe "updating an enterprise" do - let(:profile_enterprise) { create(:enterprise, type: 'profile') } + let(:profile_enterprise) { create(:enterprise, sells: 'none') } context "as manager" do - it "does not allow 'type' to be changed" do + it "does not allow 'sells' to be changed" do profile_enterprise.enterprise_roles.build(user: user).save controller.stub spree_current_user: user - enterprise_params = { id: profile_enterprise.id, enterprise: { type: 'full' } } + enterprise_params = { id: profile_enterprise.id, enterprise: { sells: 'any' } } spree_put :update, enterprise_params profile_enterprise.reload - expect(profile_enterprise.type).to eq 'profile' + expect(profile_enterprise.sells).to eq 'none' end end context "as super admin" do - it "allows 'type' to be changed" do + it "allows 'sells' to be changed" do controller.stub spree_current_user: admin_user - enterprise_params = { id: profile_enterprise.id, enterprise: { type: 'full' } } + enterprise_params = { id: profile_enterprise.id, enterprise: { sells: 'any' } } spree_put :update, enterprise_params profile_enterprise.reload - expect(profile_enterprise.type).to eq 'full' + expect(profile_enterprise.sells).to eq 'any' end end end @@ -123,38 +123,38 @@ module Admin user.save! user end - let!(:profile_enterprise1) { create(:enterprise, type: 'profile', owner: original_owner ) } - let!(:profile_enterprise2) { create(:enterprise, type: 'profile', owner: original_owner ) } + let!(:profile_enterprise1) { create(:enterprise, sells: 'none', owner: original_owner ) } + let!(:profile_enterprise2) { create(:enterprise, sells: 'none', owner: original_owner ) } context "as manager" do - it "does not allow 'type' or 'owner' to be changed" do + it "does not allow 'sells' or 'owner' to be changed" do profile_enterprise1.enterprise_roles.build(user: new_owner).save profile_enterprise2.enterprise_roles.build(user: new_owner).save controller.stub spree_current_user: new_owner - bulk_enterprise_params = { enterprise_set: { collection_attributes: { '0' => { id: profile_enterprise1.id, type: 'full', owner_id: new_owner.id }, '1' => { id: profile_enterprise2.id, type: 'full', owner_id: new_owner.id } } } } + bulk_enterprise_params = { enterprise_set: { collection_attributes: { '0' => { id: profile_enterprise1.id, sells: 'any', owner_id: new_owner.id }, '1' => { id: profile_enterprise2.id, sells: 'any', owner_id: new_owner.id } } } } spree_put :bulk_update, bulk_enterprise_params profile_enterprise1.reload profile_enterprise2.reload - expect(profile_enterprise1.type).to eq 'profile' - expect(profile_enterprise2.type).to eq 'profile' + expect(profile_enterprise1.sells).to eq 'none' + expect(profile_enterprise2.sells).to eq 'none' expect(profile_enterprise1.owner).to eq original_owner expect(profile_enterprise2.owner).to eq original_owner end end context "as super admin" do - it "allows 'type' and 'owner' to be changed" do + it "allows 'sells' and 'owner' to be changed" do profile_enterprise1.enterprise_roles.build(user: new_owner).save profile_enterprise2.enterprise_roles.build(user: new_owner).save controller.stub spree_current_user: admin_user - bulk_enterprise_params = { enterprise_set: { collection_attributes: { '0' => { id: profile_enterprise1.id, type: 'full', owner_id: new_owner.id }, '1' => { id: profile_enterprise2.id, type: 'full', owner_id: new_owner.id } } } } + bulk_enterprise_params = { enterprise_set: { collection_attributes: { '0' => { id: profile_enterprise1.id, sells: 'any', owner_id: new_owner.id }, '1' => { id: profile_enterprise2.id, sells: 'any', owner_id: new_owner.id } } } } spree_put :bulk_update, bulk_enterprise_params profile_enterprise1.reload profile_enterprise2.reload - expect(profile_enterprise1.type).to eq 'full' - expect(profile_enterprise2.type).to eq 'full' + expect(profile_enterprise1.sells).to eq 'any' + expect(profile_enterprise2.sells).to eq 'any' expect(profile_enterprise1.owner).to eq new_owner expect(profile_enterprise2.owner).to eq new_owner end diff --git a/spec/controllers/spree/admin/payment_methods_controller_spec.rb b/spec/controllers/spree/admin/payment_methods_controller_spec.rb index f3266f69c2..c27fe16f19 100644 --- a/spec/controllers/spree/admin/payment_methods_controller_spec.rb +++ b/spec/controllers/spree/admin/payment_methods_controller_spec.rb @@ -73,4 +73,4 @@ describe Spree::Admin::PaymentMethodsController do end end end -end \ No newline at end of file +end diff --git a/spec/factories.rb b/spec/factories.rb index db035ba16a..63c733524e 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -92,7 +92,8 @@ FactoryGirl.define do factory :enterprise, :class => Enterprise do owner { FactoryGirl.create :user } sequence(:name) { |n| "Enterprise #{n}" } - type 'full' + sells 'any' + is_primary_producer false description 'enterprise' long_description '

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 = []