Merge branch 'fix-issue-trackers-spec' into 'master'

Make sure all specs run properly

See merge request gitlab-org/gitlab-ce!30367

7 files changed, 36 insertions, 12 deletions

diff --git a/spec/factories/services.rb b/spec/factories/services.rb
index ecb481ed84a..cd1d2c33373 100644
--- a/spec/factories/services.rb
+++ b/spec/factories/services.rb
@@ -100,4 +100,16 @@ FactoryBot.define do
     type 'HipchatService'
     token 'test_token'
   end
+
+  trait :without_properties_callback do
+    after(:build) do |service|
+      allow(service).to receive(:handle_properties)
+    end
+
+    after(:create) do |service|
+      # we have to remove the stub because the behaviour of
+      # handle_properties method is tested after the creation
+      allow(service).to receive(:handle_properties).and_call_original
+    end
+  end
 end
diff --git a/spec/models/project_services/bugzilla_service_spec.rb b/spec/models/project_services/bugzilla_service_spec.rb
index d5b0f94f461..74c85a13c88 100644
--- a/spec/models/project_services/bugzilla_service_spec.rb
+++ b/spec/models/project_services/bugzilla_service_spec.rb
@@ -44,7 +44,9 @@ describe BugzillaService do
     # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab-ce/issues/63084
     context 'when data are stored in properties' do
       let(:properties) { access_params.merge(title: title, description: description) }
-      let(:service) { create(:bugzilla_service, properties: properties) }
+      let(:service) do
+        create(:bugzilla_service, :without_properties_callback, properties: properties)
+      end
 
       include_examples 'issue tracker fields'
     end
@@ -60,7 +62,7 @@ describe BugzillaService do
     context 'when data are stored in both properties and separated fields' do
       let(:properties) { access_params.merge(title: 'wrong title', description: 'wrong description') }
       let(:service) do
-        create(:bugzilla_service, title: title, description: description, properties: properties)
+        create(:bugzilla_service, :without_properties_callback, title: title, description: description, properties: properties)
       end
 
       include_examples 'issue tracker fields'
diff --git a/spec/models/project_services/custom_issue_tracker_service_spec.rb b/spec/models/project_services/custom_issue_tracker_service_spec.rb
index 56b0bda6626..5259357a254 100644
--- a/spec/models/project_services/custom_issue_tracker_service_spec.rb
+++ b/spec/models/project_services/custom_issue_tracker_service_spec.rb
@@ -58,7 +58,9 @@ describe CustomIssueTrackerService do
     # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab-ce/issues/63084
     context 'when data are stored in properties' do
       let(:properties) { access_params.merge(title: title, description: description) }
-      let(:service) { create(:custom_issue_tracker_service, properties: properties) }
+      let(:service) do
+        create(:custom_issue_tracker_service, :without_properties_callback, properties: properties)
+      end
 
       include_examples 'issue tracker fields'
     end
@@ -74,7 +76,7 @@ describe CustomIssueTrackerService do
     context 'when data are stored in both properties and separated fields' do
       let(:properties) { access_params.merge(title: 'wrong title', description: 'wrong description') }
       let(:service) do
-        create(:custom_issue_tracker_service, title: title, description: description, properties: properties)
+        create(:custom_issue_tracker_service, :without_properties_callback, title: title, description: description, properties: properties)
       end
 
       include_examples 'issue tracker fields'
diff --git a/spec/models/project_services/gitlab_issue_tracker_service_spec.rb b/spec/models/project_services/gitlab_issue_tracker_service_spec.rb
index a3726f09dc5..0c4fc290a13 100644
--- a/spec/models/project_services/gitlab_issue_tracker_service_spec.rb
+++ b/spec/models/project_services/gitlab_issue_tracker_service_spec.rb
@@ -61,7 +61,9 @@ describe GitlabIssueTrackerService do
     # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab-ce/issues/63084
     context 'when data are stored in properties' do
       let(:properties) { access_params.merge(title: title, description: description) }
-      let(:service) { create(:gitlab_issue_tracker_service, properties: properties) }
+      let(:service) do
+        create(:gitlab_issue_tracker_service, :without_properties_callback, properties: properties)
+      end
 
       include_examples 'issue tracker fields'
     end
@@ -77,7 +79,7 @@ describe GitlabIssueTrackerService do
     context 'when data are stored in both properties and separated fields' do
       let(:properties) { access_params.merge(title: 'wrong title', description: 'wrong description') }
       let(:service) do
-        create(:gitlab_issue_tracker_service, title: title, description: description, properties: properties)
+        create(:gitlab_issue_tracker_service, :without_properties_callback, title: title, description: description, properties: properties)
       end
 
       include_examples 'issue tracker fields'
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb
index 9b122d85293..235cf314af5 100644
--- a/spec/models/project_services/jira_service_spec.rb
+++ b/spec/models/project_services/jira_service_spec.rb
@@ -145,7 +145,9 @@ describe JiraService do
     # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab-ce/issues/63084
     context 'when data are stored in properties' do
       let(:properties) { access_params.merge(title: title, description: description) }
-      let(:service) { create(:jira_service, properties: properties) }
+      let(:service) do
+        create(:jira_service, :without_properties_callback, properties: properties)
+      end
 
       include_examples 'issue tracker fields'
     end
@@ -161,7 +163,7 @@ describe JiraService do
     context 'when data are stored in both properties and separated fields' do
       let(:properties) { access_params.merge(title: 'wrong title', description: 'wrong description') }
       let(:service) do
-        create(:jira_service, title: title, description: description, properties: properties)
+        create(:jira_service, :without_properties_callback, title: title, description: description, properties: properties)
       end
 
       include_examples 'issue tracker fields'
diff --git a/spec/models/project_services/redmine_service_spec.rb b/spec/models/project_services/redmine_service_spec.rb
index 806e3695962..c1ee6546b12 100644
--- a/spec/models/project_services/redmine_service_spec.rb
+++ b/spec/models/project_services/redmine_service_spec.rb
@@ -50,7 +50,9 @@ describe RedmineService do
     # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab-ce/issues/63084
     context 'when data are stored in properties' do
       let(:properties) { access_params.merge(title: title, description: description) }
-      let(:service) { create(:redmine_service, properties: properties) }
+      let(:service) do
+        create(:redmine_service, :without_properties_callback, properties: properties)
+      end
 
       include_examples 'issue tracker fields'
     end
@@ -66,7 +68,7 @@ describe RedmineService do
     context 'when data are stored in both properties and separated fields' do
       let(:properties) { access_params.merge(title: 'wrong title', description: 'wrong description') }
       let(:service) do
-        create(:redmine_service, title: title, description: description, properties: properties)
+        create(:redmine_service, :without_properties_callback, title: title, description: description, properties: properties)
       end
 
       include_examples 'issue tracker fields'
diff --git a/spec/models/project_services/youtrack_service_spec.rb b/spec/models/project_services/youtrack_service_spec.rb
index b47ef6702b4..c48bf487af0 100644
--- a/spec/models/project_services/youtrack_service_spec.rb
+++ b/spec/models/project_services/youtrack_service_spec.rb
@@ -47,7 +47,9 @@ describe YoutrackService do
     # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab-ce/issues/63084
     context 'when data are stored in properties' do
       let(:properties) { access_params.merge(title: title, description: description) }
-      let(:service) { create(:youtrack_service, properties: properties) }
+      let(:service) do
+        create(:youtrack_service, :without_properties_callback, properties: properties)
+      end
 
       include_examples 'issue tracker fields'
     end
@@ -63,7 +65,7 @@ describe YoutrackService do
     context 'when data are stored in both properties and separated fields' do
       let(:properties) { access_params.merge(title: 'wrong title', description: 'wrong description') }
       let(:service) do
-        create(:youtrack_service, title: title, description: description, properties: properties)
+        create(:youtrack_service, :without_properties_callback, title: title, description: description, properties: properties)
       end
 
       include_examples 'issue tracker fields'