diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/factories/projects.rb | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
download | gitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/factories/projects.rb')
-rw-r--r-- | spec/factories/projects.rb | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb index 328b7f9a229..e3411e4f925 100644 --- a/spec/factories/projects.rb +++ b/spec/factories/projects.rb @@ -3,8 +3,6 @@ require_relative '../support/helpers/test_env' FactoryBot.define do - PAGES_ACCESS_LEVEL_SCHEMA_VERSION ||= 20180423204600 - # Project without repository # # Project does not have bare repository. @@ -42,7 +40,7 @@ FactoryBot.define do forward_deployment_enabled { nil } end - after(:create) do |project, evaluator| + before(:create) do |project, evaluator| # Builds and MRs can't have higher visibility level than repository access level. builds_access_level = [evaluator.builds_access_level, evaluator.repository_access_level].min merge_requests_access_level = [evaluator.merge_requests_access_level, evaluator.repository_access_level].min @@ -54,15 +52,14 @@ FactoryBot.define do issues_access_level: evaluator.issues_access_level, forking_access_level: evaluator.forking_access_level, merge_requests_access_level: merge_requests_access_level, - repository_access_level: evaluator.repository_access_level + repository_access_level: evaluator.repository_access_level, + pages_access_level: evaluator.pages_access_level } - if ActiveRecord::Migrator.current_version >= PAGES_ACCESS_LEVEL_SCHEMA_VERSION - hash.store("pages_access_level", evaluator.pages_access_level) - end - - project.project_feature.update!(hash) + project.build_project_feature(hash) + end + after(:create) do |project, evaluator| # Normally the class Projects::CreateService is used for creating # projects, and this class takes care of making sure the owner and current # user have access to the project. Our specs don't use said service class, @@ -114,6 +111,18 @@ FactoryBot.define do import_status { :failed } end + trait :jira_dvcs_cloud do + before(:create) do |project| + create(:project_feature_usage, :dvcs_cloud, project: project) + end + end + + trait :jira_dvcs_server do + before(:create) do |project| + create(:project_feature_usage, :dvcs_server, project: project) + end + end + trait :archived do archived { true } end @@ -383,6 +392,12 @@ FactoryBot.define do end end + factory :ewm_project, parent: :project do + has_external_issue_tracker { true } + + ewm_service + end + factory :project_with_design, parent: :project do after(:create) do |project| issue = create(:issue, project: project) |