Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 10 insertions, 1 deletions

diff --git a/spec/factories/services.rb b/spec/factories/services.rb
index fd97f6abb85..9a521336fee 100644
--- a/spec/factories/services.rb
+++ b/spec/factories/services.rb
@@ -77,18 +77,27 @@ FactoryBot.define do
       username { 'jira_username' }
       password { 'jira_password' }
       jira_issue_transition_id { '56-1' }
+      issues_enabled { false }
+      project_key { nil }
     end
 
     after(:build) do |service, evaluator|
       if evaluator.create_data
         create(:jira_tracker_data, service: service,
                url: evaluator.url, api_url: evaluator.api_url, jira_issue_transition_id: evaluator.jira_issue_transition_id,
-               username: evaluator.username, password: evaluator.password
+               username: evaluator.username, password: evaluator.password, issues_enabled: evaluator.issues_enabled,
+               project_key: evaluator.project_key
         )
       end
     end
   end
 
+  factory :confluence_service do
+    project
+    active { true }
+    confluence_url { 'https://example.atlassian.net/wiki' }
+  end
+
   factory :bugzilla_service do
     project
     active { true }