diff --git a/app/controllers/api/enterprises_controller.rb b/app/controllers/api/enterprises_controller.rb index fb96bcd60d..cba50c4923 100644 --- a/app/controllers/api/enterprises_controller.rb +++ b/app/controllers/api/enterprises_controller.rb @@ -4,7 +4,7 @@ module Api before_filter :override_owner, only: [:create, :update] before_filter :check_type, only: :update before_filter :override_sells, only: [:create, :update] - before_filter :override_visiblity, only: [:create, :update] + before_filter :override_visible, only: [:create, :update] respond_to :json def managed diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb index 8bb54cfca8..03a90137d9 100644 --- a/spec/features/admin/bulk_product_update_spec.rb +++ b/spec/features/admin/bulk_product_update_spec.rb @@ -25,7 +25,7 @@ feature %q{ it "displays a message when number of products is zero" do visit '/admin/products/bulk_edit' - expect(page).to have_text "No products found." + expect(page).to have_text "No products yet. Why don't you add some?" end it "displays a select box for suppliers, with the appropriate supplier selected" do diff --git a/spec/features/admin/overview_spec.rb b/spec/features/admin/overview_spec.rb index 184d68c80b..8f7063d47e 100644 --- a/spec/features/admin/overview_spec.rb +++ b/spec/features/admin/overview_spec.rb @@ -28,11 +28,13 @@ feature %q{ end end - context "with an enterprise" do + context "with multiple enterprises" do let(:d1) { create(:distributor_enterprise) } + let(:d2) { create(:distributor_enterprise) } before :each do @enterprise_user.enterprise_roles.build(enterprise: d1).save + @enterprise_user.enterprise_roles.build(enterprise: d2).save end it "displays information about the enterprise" do diff --git a/spec/serializers/enterprise_serializer_spec.rb b/spec/serializers/enterprise_serializer_spec.rb index f3409f2d57..1063a042e7 100644 --- a/spec/serializers/enterprise_serializer_spec.rb +++ b/spec/serializers/enterprise_serializer_spec.rb @@ -18,22 +18,4 @@ describe Api::EnterpriseSerializer do serializer = Api::EnterpriseSerializer.new enterprise serializer.to_json.should match "map_005-hub.svg" end - - describe "visibility" do - before do - enterprise.stub(:visible).and_return true - end - - it "is visible when confirmed" do - enterprise.stub(:confirmed?).and_return true - serializer = Api::EnterpriseSerializer.new enterprise - expect(serializer.to_json).to match "\"visible\":true" - end - - it "is not visible when unconfirmed" do - enterprise.stub(:confirmed?).and_return false - serializer = Api::EnterpriseSerializer.new enterprise - expect(serializer.to_json).to match "\"visible\":false" - end - end end