Skip to content
代码片段 群组 项目
未验证 提交 ce77e52b 编辑于 作者: Andy Schoenen's avatar Andy Schoenen 提交者: GitLab
浏览文件

Merge branch 'add-user-factory-helpers' into 'master'

Introduce ROLE_of: user factory helpers

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149107



Merged-by: default avatarAndy Schoenen <asoiron@gitlab.com>
Approved-by: default avatarJosianne Hyson <jhyson@gitlab.com>
Approved-by: default avatarAndy Schoenen <asoiron@gitlab.com>
Reviewed-by: default avatarJosianne Hyson <jhyson@gitlab.com>
Co-authored-by: default avatarPavel Shutsin <pshutsin@gitlab.com>
No related branches found
No related tags found
1 合并请求!2419Fix TanukiBot spec relying on outdated code
显示
22 个添加22 个删除
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
include ProjectForksHelper include ProjectForksHelper
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let_it_be(:user) { create(:user, developer_projects: [project]) } let_it_be(:user) { create(:user, developer_of: project) }
let_it_be(:jira) { create(:jira_integration, project: project, issues_enabled: true, project_key: 'TEST', project_keys: ['TEST']) } let_it_be(:jira) { create(:jira_integration, project: project, issues_enabled: true, project_key: 'TEST', project_keys: ['TEST']) }
before do before do
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
RSpec.describe Projects::Integrations::Zentao::IssuesController, feature_category: :integrations do RSpec.describe Projects::Integrations::Zentao::IssuesController, feature_category: :integrations do
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let_it_be(:user) { create(:user, developer_projects: [project]) } let_it_be(:user) { create(:user, developer_of: project) }
let_it_be(:zentao_integration) { create(:zentao_integration, project: project) } let_it_be(:zentao_integration) { create(:zentao_integration, project: project) }
before do before do
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
trait :with_user do trait :with_user do
oncall_schedule {} oncall_schedule {}
user { association :user, developer_projects: [policy.project] } user { association :user, developer_of: policy.project }
end end
end end
end end
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
trait :user_can_merge do trait :user_can_merge do
authorize_user_to_merge do authorize_user_to_merge do
association(:user, maintainer_projects: [project]) association(:user, maintainer_of: project)
end end
end end
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
trait :user_can_push do trait :user_can_push do
authorize_user_to_push do authorize_user_to_push do
association(:user, maintainer_projects: [project]) association(:user, maintainer_of: project)
end end
end end
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
trait :user_can_unprotect do trait :user_can_unprotect do
authorize_user_to_unprotect do authorize_user_to_unprotect do
association(:user, maintainer_projects: [project]) association(:user, maintainer_of: project)
end end
end end
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
RSpec.describe 'User uploads metrics to incident', :js, feature_category: :incident_management do RSpec.describe 'User uploads metrics to incident', :js, feature_category: :incident_management do
let_it_be(:incident) { create(:incident) } let_it_be(:incident) { create(:incident) }
let_it_be(:project) { incident.project } let_it_be(:project) { incident.project }
let_it_be(:user) { create(:user, developer_projects: [project]) } let_it_be(:user) { create(:user, developer_of: project) }
context 'when feature is available' do context 'when feature is available' do
before do before do
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
group_milestone = create(:milestone, group: group, title: 'group_milestone_1') group_milestone = create(:milestone, group: group, title: 'group_milestone_1')
release = create(:release, project: project, milestones: [group_milestone]) release = create(:release, project: project, milestones: [group_milestone])
user = create(:user, developer_projects: [project]) user = create(:user, developer_of: project)
sign_in(user) sign_in(user)
visit project_release_path(project, release) visit project_release_path(project, release)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
RSpec.describe Clusters::AgentsFinder do RSpec.describe Clusters::AgentsFinder do
describe '#execute' do describe '#execute' do
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let_it_be(:user) { create(:user, maintainer_projects: [project]) } let_it_be(:user) { create(:user, maintainer_of: project) }
let_it_be(:reporter) { create(:user) } let_it_be(:reporter) { create(:user) }
let(:current_user) { user } let(:current_user) { user }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
RSpec.describe Mutations::AppSec::Fuzzing::Coverage::Corpus::Create do RSpec.describe Mutations::AppSec::Fuzzing::Coverage::Corpus::Create do
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let_it_be(:developer) { create(:user, developer_projects: [project]) } let_it_be(:developer) { create(:user, developer_of: project) }
let_it_be(:package) { create(:package, project: project, creator: developer) } let_it_be(:package) { create(:package, project: project, creator: developer) }
let(:corpus) { AppSec::Fuzzing::Coverage::Corpus.find_by(user: developer, project: project) } let(:corpus) { AppSec::Fuzzing::Coverage::Corpus.find_by(user: developer, project: project) }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
RSpec.describe Mutations::Dast::Profiles::Create, :dynamic_analysis, RSpec.describe Mutations::Dast::Profiles::Create, :dynamic_analysis,
feature_category: :dynamic_application_security_testing do feature_category: :dynamic_application_security_testing do
let_it_be(:project) { create(:project, :repository) } let_it_be(:project) { create(:project, :repository) }
let_it_be(:developer) { create(:user, developer_projects: [project]) } let_it_be(:developer) { create(:user, developer_of: project) }
let_it_be(:dast_site_profile) { create(:dast_site_profile, project: project) } let_it_be(:dast_site_profile) { create(:dast_site_profile, project: project) }
let_it_be(:dast_scanner_profile) { create(:dast_scanner_profile, project: project) } let_it_be(:dast_scanner_profile) { create(:dast_scanner_profile, project: project) }
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
end end
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let_it_be(:developer) { create(:user, developer_projects: [project]) } let_it_be(:developer) { create(:user, developer_of: project) }
let_it_be(:dast_profile1) { create(:dast_profile, project: project) } let_it_be(:dast_profile1) { create(:dast_profile, project: project) }
let_it_be(:dast_profile2) { create(:dast_profile, project: project) } let_it_be(:dast_profile2) { create(:dast_profile, project: project) }
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let(:ctx) { { current_user: current_user } } let(:ctx) { { current_user: current_user } }
let(:params) { {} } let(:params) { {} }
let_it_be(:maintainer) { create(:user, developer_projects: [project]) } let_it_be(:maintainer) { create(:user, developer_of: project) }
let_it_be(:reporter) { create(:user) } let_it_be(:reporter) { create(:user) }
before do before do
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
end end
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let_it_be(:developer) { create(:user, developer_projects: [project]) } let_it_be(:developer) { create(:user, developer_of: project) }
let_it_be(:dast_site_profile1) { create(:dast_site_profile, project: project) } let_it_be(:dast_site_profile1) { create(:dast_site_profile, project: project) }
let_it_be(:dast_site_profile2) { create(:dast_site_profile, project: project) } let_it_be(:dast_site_profile2) { create(:dast_site_profile, project: project) }
let_it_be(:dast_site_profile3) do let_it_be(:dast_site_profile3) do
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
let_it_be(:project) { create(:project, :repository) } let_it_be(:project) { create(:project, :repository) }
let_it_be(:object) { create(:corpus, project: project) } let_it_be(:object) { create(:corpus, project: project) }
let_it_be(:user) { create(:user, developer_projects: [project]) } let_it_be(:user) { create(:user, developer_of: project) }
let_it_be(:fields) { %i[id package] } let_it_be(:fields) { %i[id package] }
specify { expect(described_class.graphql_name).to eq('CoverageFuzzingCorpus') } specify { expect(described_class.graphql_name).to eq('CoverageFuzzingCorpus') }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
) )
end end
let_it_be(:user) { create(:user, developer_projects: [project]) } let_it_be(:user) { create(:user, developer_of: project) }
let_it_be(:fields) { %i[name check_type errors success] } let_it_be(:fields) { %i[name check_type errors success] }
before do before do
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let_it_be(:dast_profile) { create(:dast_profile, project: project) } let_it_be(:dast_profile) { create(:dast_profile, project: project) }
let_it_be(:object) { create(:dast_pre_scan_verification, dast_profile: dast_profile) } let_it_be(:object) { create(:dast_pre_scan_verification, dast_profile: dast_profile) }
let_it_be(:user) { create(:user, developer_projects: [project]) } let_it_be(:user) { create(:user, developer_of: project) }
let_it_be(:dast_pre_scan_verification_step_1) do let_it_be(:dast_pre_scan_verification_step_1) do
create( create(
:dast_pre_scan_verification_step, :dast_pre_scan_verification_step,
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
let_it_be(:fields) { %i[id active startsAt timezone nextRunAt cadence ownerValid] } let_it_be(:fields) { %i[id active startsAt timezone nextRunAt cadence ownerValid] }
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let_it_be(:user) { create(:user, developer_projects: [project]) } let_it_be(:user) { create(:user, developer_of: project) }
let_it_be(:object) { create(:dast_profile_schedule, project: project, owner: user) } let_it_be(:object) { create(:dast_profile_schedule, project: project, owner: user) }
specify { expect(described_class.graphql_name).to eq('DastProfileSchedule') } specify { expect(described_class.graphql_name).to eq('DastProfileSchedule') }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
let_it_be(:project) { create(:project, :repository) } let_it_be(:project) { create(:project, :repository) }
let_it_be(:object) { create(:dast_profile, project: project) } let_it_be(:object) { create(:dast_profile, project: project) }
let_it_be(:dast_pre_scan_verification) { create(:dast_pre_scan_verification, dast_profile: object) } let_it_be(:dast_pre_scan_verification) { create(:dast_pre_scan_verification, dast_profile: object) }
let_it_be(:user) { create(:user, developer_projects: [project]) } let_it_be(:user) { create(:user, developer_of: project) }
let_it_be(:tag_list) { %w[ruby postgres] } let_it_be(:tag_list) { %w[ruby postgres] }
let_it_be(:fields) do let_it_be(:fields) do
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
include GraphqlHelpers include GraphqlHelpers
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let_it_be(:user) { create(:user, developer_projects: [project]) } let_it_be(:user) { create(:user, developer_of: project) }
let_it_be(:object, reload: true) { create(:dast_site_profile, project: project) } let_it_be(:object, reload: true) { create(:dast_site_profile, project: project) }
let_it_be(:fields) { %i[enabled url usernameField passwordField username password submitField] } let_it_be(:fields) { %i[enabled url usernameField passwordField username password submitField] }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
include RepoHelpers include RepoHelpers
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let_it_be(:user) { create(:user, developer_projects: [project]) } let_it_be(:user) { create(:user, developer_of: project) }
let_it_be(:object, reload: true) { create(:dast_site_profile, project: project) } let_it_be(:object, reload: true) { create(:dast_site_profile, project: project) }
let_it_be(:fields) { %i[id profileName targetUrl targetType editPath excludedUrls requestHeaders validationStatus userPermissions normalizedTargetUrl auth referencedInSecurityPolicies scanMethod scanFilePath validationStartedAt] } let_it_be(:fields) { %i[id profileName targetUrl targetType editPath excludedUrls requestHeaders validationStatus userPermissions normalizedTargetUrl auth referencedInSecurityPolicies scanMethod scanFilePath validationStartedAt] }
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
let!(:project) { create(:project) } let!(:project) { create(:project) }
let!(:protected_branch) { create(:protected_branch, :developers_can_merge, :maintainers_can_push, project: project) } let!(:protected_branch) { create(:protected_branch, :developers_can_merge, :maintainers_can_push, project: project) }
let!(:deploy_key) { create(:deploy_key, deploy_keys_projects: [create(:deploy_keys_project, :write_access, project: project)]) } let!(:deploy_key) { create(:deploy_key, deploy_keys_projects: [create(:deploy_keys_project, :write_access, project: project)]) }
let(:user) { create(:user, maintainer_projects: [project]) } let(:user) { create(:user, maintainer_of: project) }
let(:merge_level) { protected_branch.merge_access_levels.first } let(:merge_level) { protected_branch.merge_access_levels.first }
let(:push_level) { protected_branch.push_access_levels.first } let(:push_level) { protected_branch.push_access_levels.first }
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册