diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-17 13:07:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-17 13:07:47 +0300 |
commit | d670c3006e6e44901bce0d53cc4768d1d80ffa92 (patch) | |
tree | 8f65743c232e5b76850c4cc264ba15e1185815ff /spec/factories | |
parent | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (diff) |
Add latest changes from gitlab-org/gitlab@14-0-stable-ee
Diffstat (limited to 'spec/factories')
-rw-r--r-- | spec/factories/integrations.rb | 6 | ||||
-rw-r--r-- | spec/factories/packages/package_file.rb | 2 | ||||
-rw-r--r-- | spec/factories/projects.rb | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/spec/factories/integrations.rb b/spec/factories/integrations.rb index fd570ca9c50..1dd2839aa46 100644 --- a/spec/factories/integrations.rb +++ b/spec/factories/integrations.rb @@ -12,7 +12,7 @@ FactoryBot.define do issue_tracker end - factory :emails_on_push_service, class: 'Integrations::EmailsOnPush' do + factory :emails_on_push_integration, class: 'Integrations::EmailsOnPush' do project type { 'EmailsOnPushService' } active { true } @@ -103,7 +103,7 @@ FactoryBot.define do issue_tracker end - factory :ewm_service, class: 'Integrations::Ewm' do + factory :ewm_integration, class: 'Integrations::Ewm' do project active { true } issue_tracker @@ -127,7 +127,7 @@ FactoryBot.define do end end - factory :external_wiki_service, class: 'Integrations::ExternalWiki' do + factory :external_wiki_integration, class: 'Integrations::ExternalWiki' do project type { 'ExternalWikiService' } active { true } diff --git a/spec/factories/packages/package_file.rb b/spec/factories/packages/package_file.rb index b02af85dbeb..d82fbe02311 100644 --- a/spec/factories/packages/package_file.rb +++ b/spec/factories/packages/package_file.rb @@ -208,6 +208,8 @@ FactoryBot.define do transient do without_loaded_metadatum { false } + package_name { package&.name || 'foo' } + sequence(:package_version) { |n| package&.version || "v#{n}" } channel { 'stable' } end diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb index cc561ef65a2..6641d8749f9 100644 --- a/spec/factories/projects.rb +++ b/spec/factories/projects.rb @@ -426,7 +426,7 @@ FactoryBot.define do factory :ewm_project, parent: :project do has_external_issue_tracker { true } - ewm_service + ewm_integration end factory :project_with_design, parent: :project do |