Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-06-26 21:08:59 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-06-26 21:08:59 +0300
commit5f825c2edec69e9a23e100c949c6c40e88ae5235 (patch)
treedc510f698f6885ae3656da30eb4c4e5ab4f5dd58 /spec/factories
parentc46e0d0c271a21b67a3412faf750d27dd63432bb (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/factories')
-rw-r--r--spec/factories/ci/external_pull_requests.rb (renamed from spec/factories/external_pull_requests.rb)2
-rw-r--r--spec/factories/integrations.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/spec/factories/external_pull_requests.rb b/spec/factories/ci/external_pull_requests.rb
index 470814f4360..9a16e400101 100644
--- a/spec/factories/external_pull_requests.rb
+++ b/spec/factories/ci/external_pull_requests.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
FactoryBot.define do
- factory :external_pull_request do
+ factory :external_pull_request, class: 'Ci::ExternalPullRequest' do
sequence(:pull_request_iid)
project
source_branch { 'feature' }
diff --git a/spec/factories/integrations.rb b/spec/factories/integrations.rb
index c3ae0279c05..a89edc19cc7 100644
--- a/spec/factories/integrations.rb
+++ b/spec/factories/integrations.rb
@@ -136,6 +136,8 @@ FactoryBot.define do
jira_auth_type: evaluator.jira_auth_type,
jira_issue_transition_automatic: evaluator.jira_issue_transition_automatic,
jira_issue_transition_id: evaluator.jira_issue_transition_id,
+ jira_issue_prefix: evaluator.jira_issue_prefix,
+ jira_issue_regex: evaluator.jira_issue_regex,
username: evaluator.username, password: evaluator.password, issues_enabled: evaluator.issues_enabled,
project_key: evaluator.project_key, vulnerabilities_enabled: evaluator.vulnerabilities_enabled,
vulnerabilities_issuetype: evaluator.vulnerabilities_issuetype, deployment_type: evaluator.deployment_type