fix: concurrent context tests are removed in unit/actions. Uniqueness tests are reintroduced in unit/models.

Author: serdarozerr

spec/unit/actions/organization_create_spec.rb

@@ -110,23 +110,6 @@ module VCAP::CloudController
             end.to raise_error(OrganizationCreate::Error, "Organization '#{name}' already exists.")
           end
         end
-
-        context 'when creating organizations concurrently' do
-          let(:name) { 'Alfredo' }
-
-          it 'ensures one creation is successful and the other fails due to name conflict' do
-            # First request, should succeed
-            message = VCAP::CloudController::OrganizationUpdateMessage.new(name:)
-            expect do
-              org_create.create(message)
-            end.not_to raise_error
-
-            # Second request, should fail with correct error
-            expect do
-              org_create.create(message)
-            end.to raise_error(OrganizationCreate::Error, "Organization 'Alfredo' already exists.")
-          end
-        end
       end
     end
   end

spec/unit/actions/service_broker_create_spec.rb

@@ -132,20 +132,6 @@ module CloudController
           end
         end
       end
-
-      describe 'when creating a service broker with the same name concurrently' do
-        it 'ensures one creation is successful and the other fails due to name conflict' do
-          # First request, should succeed
-          expect do
-            action.create(message)
-          end.not_to raise_error
-
-          # Second request, should fail with correct error
-          expect do
-            action.create(message)
-          end.to raise_error(V3::ServiceBrokerCreate::InvalidServiceBroker)
-        end
-      end
     end
   end
 end

spec/unit/actions/space_create_spec.rb

@@ -79,23 +79,6 @@ module VCAP::CloudController
             end.to raise_error(SpaceCreate::Error, 'Name must be unique per organization')
           end
         end
-
-        context 'when creating spaces concurrently' do
-          let(:name) { 'Rose' }
-
-          it 'ensures one creation is successful and the other fails due to name conflict' do
-            # First request, should succeed
-            message = VCAP::CloudController::SpaceCreateMessage.new(name:)
-            expect do
-              SpaceCreate.new(user_audit_info:).create(org, message)
-            end.not_to raise_error
-
-            # Second request, should fail with correct error
-            expect do
-              SpaceCreate.new(user_audit_info:).create(org, message)
-            end.to raise_error(SpaceCreate::Error, 'Name must be unique per organization')
-          end
-        end
       end
     end
   end

spec/unit/actions/space_quotas_create_spec.rb

@@ -202,20 +202,6 @@ module VCAP::CloudController
           end
         end
       end
-
-      context 'when creating space quota with the same name concurrently' do
-        it 'ensures one creation is successful and the other fails due to name conflict' do
-          # First request, should succeed
-          expect do
-            space_quotas_create.create(message, organization: org)
-          end.not_to raise_error
-
-          # Second request, should fail with correct error
-          expect do
-            space_quotas_create.create(message, organization: org)
-          end.to raise_error(SpaceQuotasCreate::Error, "Space Quota 'my-name' already exists.")
-        end
-      end
     end
   end
 end

spec/unit/actions/stack_create_spec.rb

@@ -119,23 +119,6 @@ module VCAP::CloudController
           end.to raise_error(StackCreate::Error, 'Name must be unique')
         end
       end
-
-      context 'when creating stack with the same name concurrently' do
-        let(:name) { 'Gaby' }
-
-        it 'ensures one creation is successful and the other fails due to name conflict' do
-          message = VCAP::CloudController::StackCreateMessage.new(name:)
-          # First request, should succeed
-          expect do
-            stack_create.create(message)
-          end.not_to raise_error
-
-          # Second request, should fail with correct error
-          expect do
-            stack_create.create(message)
-          end.to raise_error(StackCreate::Error, 'Name must be unique')
-        end
-      end
     end
   end
 end

spec/unit/actions/user_create_spec.rb

@@ -35,22 +35,6 @@ module VCAP::CloudController
         end
       end
 
-      context 'when creating users concurrently' do
-        let(:message) { UserCreateMessage.new({ guid: 'some-nice-user-gu-id' }) }
-
-        it 'ensures one creation is successful and the other fails due to name conflict' do
-          # First request, should succeed
-          expect do
-            subject.create(message:)
-          end.not_to raise_error
-
-          # Second request, should fail with correct error
-          expect do
-            subject.create(message:)
-          end.to raise_error(UserCreate::Error, "User with guid 'some-nice-user-gu-id' already exists.")
-        end
-      end
-
       describe 'creating users' do
         before do
           allow(User).to receive_messages(create_uaa_shadow_user: { 'id' => guid }, get_user_id_by_username_and_origin: nil)

spec/unit/isolation_segment_create_spec.rb

@@ -44,21 +44,6 @@ module VCAP::CloudController
           end.to raise_error(IsolationSegmentCreate::Error, 'blork is busted')
         end
       end
-
-      context 'when creating isolation segments concurrently' do
-        it 'ensures one creation is successful and the other fails due to name conflict' do
-          # First request, should succeed
-          message = VCAP::CloudController::IsolationSegmentCreateMessage.new(name: 'foobar')
-          expect do
-            IsolationSegmentCreate.create(message)
-          end.not_to raise_error
-
-          # Second request, should fail with correct error
-          expect do
-            IsolationSegmentCreate.create(message)
-          end.to raise_error(IsolationSegmentCreate::Error, 'Isolation Segment names are case insensitive and must be unique')
-        end
-      end
     end
   end
 end

spec/unit/models/runtime/isolation_segment_model_spec.rb

@@ -124,6 +124,22 @@ module VCAP::CloudController
         end.to raise_error(Sequel::ValidationFailed, 'Isolation Segment names can only contain non-blank unicode characters')
       end
 
+      it 'requires a unique name' do
+        IsolationSegmentModel.make(name: 'segment1')
+
+        expect do
+          IsolationSegmentModel.make(name: 'segment1')
+        end.to raise_error(Sequel::ValidationFailed, 'Isolation Segment names are case insensitive and must be unique')
+      end
+
+      it 'uniqueness is case insensitive' do
+        IsolationSegmentModel.make(name: 'lowercase')
+
+        expect do
+          IsolationSegmentModel.make(name: 'lowerCase')
+        end.to raise_error(Sequel::ValidationFailed, 'Isolation Segment names are case insensitive and must be unique')
+      end
+
       it 'allows standard ascii characters' do
         expect do
           IsolationSegmentModel.make(name: "A -_- word 2!?()'\"&+.")

spec/unit/models/runtime/organization_spec.rb

@@ -121,6 +121,15 @@ module VCAP::CloudController
       end
     end
 
+    describe 'uniqueness' do
+      it 'enforces uniqueness of name' do
+        existing_org = Organization.make
+        expect do
+          Organization.create(name: existing_org.name)
+        end.to raise_error(Sequel::ValidationFailed, /unique/)
+      end
+    end
+
     describe 'Validations' do
       let(:org) { Organization.make }
 

spec/unit/models/runtime/space_quota_definition_spec.rb

@@ -17,6 +17,15 @@ module VCAP::CloudController
       end
     end
 
+    describe 'uniqueness' do
+      it 'enforces uniqueness of name within an organization' do
+        existing_quota = SpaceQuotaDefinition.make
+        expect do
+          SpaceQuotaDefinition.make(name: existing_quota.name, organization: existing_quota.organization)
+        end.to raise_error(Sequel::ValidationFailed, /unique/)
+      end
+    end
+
     describe 'Validations' do
       it { is_expected.to validate_presence :name }
       it { is_expected.to validate_presence :non_basic_services_allowed }