summaryrefslogtreecommitdiff
path: root/spec/factories
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-14 06:09:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-14 06:09:14 +0000
commit8c558095790d0b9ae67344a05975f1f84f8df837 (patch)
tree786c71e2d3d57c18ef4917e83423d0fcf609a70a /spec/factories
parent8957ace3159e5369a700a77614493ed6a8a98f93 (diff)
downloadgitlab-ce-8c558095790d0b9ae67344a05975f1f84f8df837.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/factories')
-rw-r--r--spec/factories/services.rb16
1 files changed, 11 insertions, 5 deletions
diff --git a/spec/factories/services.rb b/spec/factories/services.rb
index ebab370ccf6..2d6d8d71917 100644
--- a/spec/factories/services.rb
+++ b/spec/factories/services.rb
@@ -4,11 +4,6 @@ FactoryBot.define do
factory :service do
project
type { 'Service' }
-
- trait :instance do
- project { nil }
- instance { true }
- end
end
factory :custom_issue_tracker_service, class: 'CustomIssueTrackerService' do
@@ -69,6 +64,7 @@ FactoryBot.define do
factory :jira_service do
project
active { true }
+ type { 'JiraService' }
transient do
create_data { true }
@@ -159,4 +155,14 @@ FactoryBot.define do
IssueTrackerService.set_callback(:validation, :before, :handle_properties)
end
end
+
+ trait :template do
+ project { nil }
+ template { true }
+ end
+
+ trait :instance do
+ project { nil }
+ instance { true }
+ end
end