Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index d0673b21329..7c80b5231d1 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -56,6 +56,14 @@ describe Service do
         expect(build(:service, :instance)).to be_invalid
       end
     end
+
+    it 'validates uniqueness of type and project_id on create' do
+      project = create(:project)
+
+      expect(create(:service, project: project, type: 'Service')).to be_valid
+      expect(build(:service, project: project, type: 'Service').valid?(:create)).to eq(false)
+      expect(build(:service, project: project, type: 'Service').valid?(:update)).to eq(true)
+    end
   end
 
   describe 'Scopes' do