diff --git a/spec/presenters/blob_presenter_spec.rb b/spec/presenters/blob_presenter_spec.rb index 3bf592ed2b9f954a19e71c436ac983f99eb2fcca..30c5d17b2aab06c05eb0e22aaa80841e3c84de7d 100644 --- a/spec/presenters/blob_presenter_spec.rb +++ b/spec/presenters/blob_presenter_spec.rb @@ -4,7 +4,7 @@ RSpec.describe BlobPresenter do let_it_be(:project) { create(:project, :repository) } - let_it_be(:user) { project.owner } + let_it_be(:user) { project.first_owner } let(:repository) { project.repository } let(:blob) { repository.blob_at('HEAD', 'files/ruby/regex.rb') } diff --git a/spec/requests/api/api_spec.rb b/spec/requests/api/api_spec.rb index 6a02f81fcaeddddc3039d36548bd3e6380aa3b23..df9be2616c5e5876400a084b0d347632c491b86b 100644 --- a/spec/requests/api/api_spec.rb +++ b/spec/requests/api/api_spec.rb @@ -102,7 +102,7 @@ describe 'logging', :aggregate_failures do let_it_be(:project) { create(:project, :public) } - let_it_be(:user) { project.owner } + let_it_be(:user) { project.first_owner } context 'when the endpoint is handled by the application' do context 'when the endpoint supports all possible fields' do diff --git a/spec/requests/api/ci/pipelines_spec.rb b/spec/requests/api/ci/pipelines_spec.rb index 13838cffd762d7ba23aea0593061e62f0f3f4a23..1b87a5e24f5003161c553356aefe40c41d784f4a 100644 --- a/spec/requests/api/ci/pipelines_spec.rb +++ b/spec/requests/api/ci/pipelines_spec.rb @@ -988,7 +988,7 @@ def expect_variables(variables, expected_variables) describe 'DELETE /projects/:id/pipelines/:pipeline_id' do context 'authorized user' do - let(:owner) { project.owner } + let(:owner) { project.first_owner } it 'destroys the pipeline' do delete api("/projects/#{project.id}/pipelines/#{pipeline.id}", owner) diff --git a/spec/requests/api/ci/runners_reset_registration_token_spec.rb b/spec/requests/api/ci/runners_reset_registration_token_spec.rb index df64c0bd22bdf5b1549ecca1f14652cd489ba663..e1dc347f8dd740d22eeb334ab24caf50e8cc5b3d 100644 --- a/spec/requests/api/ci/runners_reset_registration_token_spec.rb +++ b/spec/requests/api/ci/runners_reset_registration_token_spec.rb @@ -138,7 +138,7 @@ def get_token end include_context 'when authorized', 'project' do - let_it_be(:user) { project.owner } + let_it_be(:user) { project.first_owner } def get_token project.reload.runners_token diff --git a/spec/requests/api/graphql/ci/ci_cd_setting_spec.rb b/spec/requests/api/graphql/ci/ci_cd_setting_spec.rb index 578a71a7272e63b60a5e6937c7dd8edbad2a983c..c19defa37e8a74a4cd2b8e97e1e188abed90176a 100644 --- a/spec/requests/api/graphql/ci/ci_cd_setting_spec.rb +++ b/spec/requests/api/graphql/ci/ci_cd_setting_spec.rb @@ -5,7 +5,7 @@ include GraphqlHelpers let_it_be_with_reload(:project) { create(:project, :repository) } - let_it_be(:current_user) { project.owner } + let_it_be(:current_user) { project.first_owner } let(:fields) do <<~QUERY diff --git a/spec/requests/api/graphql/container_repository/container_repository_details_spec.rb b/spec/requests/api/graphql/container_repository/container_repository_details_spec.rb index 802ab847b3d3ecb694c1d1701c34079d5bfdc07f..35a70a180a28c28efbd99e5e2f82652c97f9b5be 100644 --- a/spec/requests/api/graphql/container_repository/container_repository_details_spec.rb +++ b/spec/requests/api/graphql/container_repository/container_repository_details_spec.rb @@ -17,7 +17,7 @@ ) end - let(:user) { project.owner } + let(:user) { project.first_owner } let(:variables) { {} } let(:tags) { %w[latest tag1 tag2 tag3 tag4 tag5] } let(:container_repository_global_id) { container_repository.to_global_id.to_s } diff --git a/spec/requests/api/graphql/gitlab_schema_spec.rb b/spec/requests/api/graphql/gitlab_schema_spec.rb index 8bbeae97f57c391c5ad02e5f0542f68c8b1ec133..e80f5e0e0ff53f65f68e38e9b7e908f89039945d 100644 --- a/spec/requests/api/graphql/gitlab_schema_spec.rb +++ b/spec/requests/api/graphql/gitlab_schema_spec.rb @@ -166,7 +166,7 @@ end context 'authentication' do - let(:current_user) { project.owner } + let(:current_user) { project.first_owner } it 'authenticates all queries' do subject @@ -216,7 +216,7 @@ context "global id's" do it 'uses GlobalID to expose ids' do post_graphql(graphql_query_for('project', { 'fullPath' => project.full_path }, %w(id)), - current_user: project.owner) + current_user: project.first_owner) parsed_id = GlobalID.parse(graphql_data['project']['id']) diff --git a/spec/requests/api/graphql/mutations/ci/ci_cd_settings_update_spec.rb b/spec/requests/api/graphql/mutations/ci/ci_cd_settings_update_spec.rb index 05f6804a20854c42be79453b3bca9a5150201835..30e7f19654237c7b625ffbc80a0dfb71a92e8820 100644 --- a/spec/requests/api/graphql/mutations/ci/ci_cd_settings_update_spec.rb +++ b/spec/requests/api/graphql/mutations/ci/ci_cd_settings_update_spec.rb @@ -45,7 +45,7 @@ end context 'when authorized' do - let_it_be(:user) { project.owner } + let_it_be(:user) { project.first_owner } it 'updates ci cd settings' do post_graphql_mutation(mutation, current_user: user) diff --git a/spec/requests/api/graphql/mutations/ci/job_token_scope/add_project_spec.rb b/spec/requests/api/graphql/mutations/ci/job_token_scope/add_project_spec.rb index b53a7ddde32aa4803ad91173fa4a06f4257e0579..5269c60b50a38977fea1cb8e893762c0a61408e0 100644 --- a/spec/requests/api/graphql/mutations/ci/job_token_scope/add_project_spec.rb +++ b/spec/requests/api/graphql/mutations/ci/job_token_scope/add_project_spec.rb @@ -49,7 +49,7 @@ end context 'when authorized' do - let_it_be(:current_user) { project.owner } + let_it_be(:current_user) { project.first_owner } before do target_project.add_developer(current_user) diff --git a/spec/requests/api/graphql/mutations/ci/job_token_scope/remove_project_spec.rb b/spec/requests/api/graphql/mutations/ci/job_token_scope/remove_project_spec.rb index f1f42b00ada8150ef4da5cd7d8a45735af760152..b62291d1ebdf8988014bad5720c18adb0d990142 100644 --- a/spec/requests/api/graphql/mutations/ci/job_token_scope/remove_project_spec.rb +++ b/spec/requests/api/graphql/mutations/ci/job_token_scope/remove_project_spec.rb @@ -55,7 +55,7 @@ end context 'when authorized' do - let_it_be(:current_user) { project.owner } + let_it_be(:current_user) { project.first_owner } before do target_project.add_guest(current_user) diff --git a/spec/requests/api/graphql/mutations/ci/pipeline_destroy_spec.rb b/spec/requests/api/graphql/mutations/ci/pipeline_destroy_spec.rb index 08959d354e2aae20e8cccacf8207fd4b00170f56..37656ab4eea22c84a2d463a64232bb071d1c1a51 100644 --- a/spec/requests/api/graphql/mutations/ci/pipeline_destroy_spec.rb +++ b/spec/requests/api/graphql/mutations/ci/pipeline_destroy_spec.rb @@ -6,7 +6,7 @@ include GraphqlHelpers let_it_be(:project) { create(:project) } - let_it_be(:user) { project.owner } + let_it_be(:user) { project.first_owner } let_it_be(:pipeline) { create(:ci_pipeline, :success, project: project, user: user) } let(:mutation) do diff --git a/spec/requests/api/graphql/mutations/ci/runners_registration_token/reset_spec.rb b/spec/requests/api/graphql/mutations/ci/runners_registration_token/reset_spec.rb index 322706be11978912f8045285abaebb58c4d52951..12368e7e9c57e11f25f8cd4156940f9acc2134c1 100644 --- a/spec/requests/api/graphql/mutations/ci/runners_registration_token/reset_spec.rb +++ b/spec/requests/api/graphql/mutations/ci/runners_registration_token/reset_spec.rb @@ -71,7 +71,7 @@ end include_context 'when authorized', 'project' do - let_it_be(:user) { project.owner } + let_it_be(:user) { project.first_owner } def get_token project.reload.runners_token diff --git a/spec/requests/api/graphql/mutations/security/ci_configuration/configure_sast_iac_spec.rb b/spec/requests/api/graphql/mutations/security/ci_configuration/configure_sast_iac_spec.rb index 929609d41602455fdd5bf9264770aec3822d8b64..0c034f38dc80008898218ca708a73fef4b1d1d19 100644 --- a/spec/requests/api/graphql/mutations/security/ci_configuration/configure_sast_iac_spec.rb +++ b/spec/requests/api/graphql/mutations/security/ci_configuration/configure_sast_iac_spec.rb @@ -12,7 +12,7 @@ let(:mutation_response) { graphql_mutation_response(:configureSastIac) } context 'when authorized' do - let_it_be(:user) { project.owner } + let_it_be(:user) { project.first_owner } it 'creates a branch with sast iac configured' do post_graphql_mutation(mutation, current_user: user) diff --git a/spec/requests/api/graphql/mutations/security/ci_configuration/configure_secret_detection_spec.rb b/spec/requests/api/graphql/mutations/security/ci_configuration/configure_secret_detection_spec.rb index 23a154b71a02924c183548784c1de64c1bfa9d68..8fa6e44b208670faa96dee016436c71afa23e71e 100644 --- a/spec/requests/api/graphql/mutations/security/ci_configuration/configure_secret_detection_spec.rb +++ b/spec/requests/api/graphql/mutations/security/ci_configuration/configure_secret_detection_spec.rb @@ -12,7 +12,7 @@ let(:mutation_response) { graphql_mutation_response(:configureSecretDetection) } context 'when authorized' do - let_it_be(:user) { project.owner } + let_it_be(:user) { project.first_owner } it 'creates a branch with secret detection configured' do post_graphql_mutation(mutation, current_user: user) diff --git a/spec/requests/api/graphql/project/container_expiration_policy_spec.rb b/spec/requests/api/graphql/project/container_expiration_policy_spec.rb index dc16847a669d213fef7db906f90f3b9ad5016135..e3ea9e46353058c20957997870daa5c87d5d6793 100644 --- a/spec/requests/api/graphql/project/container_expiration_policy_spec.rb +++ b/spec/requests/api/graphql/project/container_expiration_policy_spec.rb @@ -5,7 +5,7 @@ include GraphqlHelpers let_it_be(:project) { create(:project) } - let_it_be(:current_user) { project.owner } + let_it_be(:current_user) { project.first_owner } let_it_be(:container_expiration_policy) { project.container_expiration_policy } let(:fields) do diff --git a/spec/requests/api/graphql/project/container_repositories_spec.rb b/spec/requests/api/graphql/project/container_repositories_spec.rb index 692143b2215528af584d03bbb73b59e11b1cd9d4..bbab6012f3ff311b283e49158b481ea339c27af2 100644 --- a/spec/requests/api/graphql/project/container_repositories_spec.rb +++ b/spec/requests/api/graphql/project/container_repositories_spec.rb @@ -38,7 +38,7 @@ ) end - let(:user) { project.owner } + let(:user) { project.first_owner } let(:variables) { {} } let(:container_repositories_response) { graphql_data.dig('project', 'containerRepositories', 'edges') } let(:container_repositories_count_response) { graphql_data.dig('project', 'containerRepositoriesCount') } diff --git a/spec/requests/api/graphql/project/error_tracking/sentry_detailed_error_request_spec.rb b/spec/requests/api/graphql/project/error_tracking/sentry_detailed_error_request_spec.rb index 40a3281d3b756bfa61d5f1753567c25f2a9ed2bc..2b85704f4790c68f3eeb9f312a6d2f8c6eda3a33 100644 --- a/spec/requests/api/graphql/project/error_tracking/sentry_detailed_error_request_spec.rb +++ b/spec/requests/api/graphql/project/error_tracking/sentry_detailed_error_request_spec.rb @@ -6,7 +6,7 @@ let_it_be(:project) { create(:project, :repository) } let_it_be(:project_setting) { create(:project_error_tracking_setting, project: project) } - let_it_be(:current_user) { project.owner } + let_it_be(:current_user) { project.first_owner } let_it_be(:sentry_detailed_error) { build(:error_tracking_sentry_detailed_error) } let(:sentry_gid) { sentry_detailed_error.to_global_id.to_s } diff --git a/spec/requests/api/graphql/project/error_tracking/sentry_errors_request_spec.rb b/spec/requests/api/graphql/project/error_tracking/sentry_errors_request_spec.rb index a540386a9def770ed34064f1d87036ca39a14315..3ca0e35882ac766fce875f7d239d5905d8389f05 100644 --- a/spec/requests/api/graphql/project/error_tracking/sentry_errors_request_spec.rb +++ b/spec/requests/api/graphql/project/error_tracking/sentry_errors_request_spec.rb @@ -6,7 +6,7 @@ let_it_be(:project) { create(:project, :repository) } let_it_be(:project_setting) { create(:project_error_tracking_setting, project: project) } - let_it_be(:current_user) { project.owner } + let_it_be(:current_user) { project.first_owner } let(:query) do graphql_query_for( diff --git a/spec/requests/api/graphql/project/grafana_integration_spec.rb b/spec/requests/api/graphql/project/grafana_integration_spec.rb index 9b24698f40c27be7c7a4bd2d313a434fb331e046..e7534945e7a864faa3f8bf29c15d50b489e367f2 100644 --- a/spec/requests/api/graphql/project/grafana_integration_spec.rb +++ b/spec/requests/api/graphql/project/grafana_integration_spec.rb @@ -5,7 +5,7 @@ include GraphqlHelpers let_it_be(:project) { create(:project, :repository) } - let_it_be(:current_user) { project.owner } + let_it_be(:current_user) { project.first_owner } let_it_be(:grafana_integration) { create(:grafana_integration, project: project) } let(:fields) do diff --git a/spec/requests/api/graphql/project/issue/design_collection/versions_spec.rb b/spec/requests/api/graphql/project/issue/design_collection/versions_spec.rb index 9d98498ca8a6345cc57f0eebd39bef68d1d159c8..46fd65db1c5064ca43030c83a3c459cb8834d407 100644 --- a/spec/requests/api/graphql/project/issue/design_collection/versions_spec.rb +++ b/spec/requests/api/graphql/project/issue/design_collection/versions_spec.rb @@ -24,7 +24,7 @@ create(:design_version, issue: issue) end - let_it_be(:owner) { issue.project.owner } + let_it_be(:owner) { issue.project.first_owner } def version_query(params = version_params) query_graphql_field(:versions, params, version_query_fields) diff --git a/spec/requests/api/graphql/project/issue/designs/designs_spec.rb b/spec/requests/api/graphql/project/issue/designs/designs_spec.rb index def41efddde00af835662e41cbb8e23e356855cb..f02053199838876082c31a144435bf5f3ab6d9e6 100644 --- a/spec/requests/api/graphql/project/issue/designs/designs_spec.rb +++ b/spec/requests/api/graphql/project/issue/designs/designs_spec.rb @@ -7,7 +7,7 @@ include DesignManagementTestHelpers let_it_be(:design) { create(:design, :with_smaller_image_versions, versions_count: 1) } - let_it_be(:current_user) { design.project.owner } + let_it_be(:current_user) { design.project.first_owner } let(:design_query) do <<~NODE diff --git a/spec/requests/api/graphql/project/issue/designs/notes_spec.rb b/spec/requests/api/graphql/project/issue/designs/notes_spec.rb index 7148750b6cb0dd7d521f8bd1c6de308f31bf9eaa..de2ace95757177ce2ef5efd2c740ed4b89db51f2 100644 --- a/spec/requests/api/graphql/project/issue/designs/notes_spec.rb +++ b/spec/requests/api/graphql/project/issue/designs/notes_spec.rb @@ -9,7 +9,7 @@ let_it_be(:project) { create(:project, :public) } let_it_be(:issue) { create(:issue, project: project) } let_it_be(:design) { create(:design, :with_file, versions_count: 1, issue: issue) } - let_it_be(:current_user) { project.owner } + let_it_be(:current_user) { project.first_owner } let_it_be(:note) { create(:diff_note_on_design, noteable: design, project: project) } before do diff --git a/spec/requests/api/graphql/project/repository/blobs_spec.rb b/spec/requests/api/graphql/project/repository/blobs_spec.rb index 12f6fbd793ecc5b4eb56bbad0d0df50e5551a0f6..ba87f1100f2f79853277abdf43720faa1211c59d 100644 --- a/spec/requests/api/graphql/project/repository/blobs_spec.rb +++ b/spec/requests/api/graphql/project/repository/blobs_spec.rb @@ -5,7 +5,7 @@ include GraphqlHelpers let(:project) { create(:project, :repository) } - let(:current_user) { project.owner } + let(:current_user) { project.first_owner } let(:paths) { ["CONTRIBUTING.md", "README.md"] } let(:ref) { project.default_branch } let(:fields) do diff --git a/spec/requests/api/graphql/project/repository_spec.rb b/spec/requests/api/graphql/project/repository_spec.rb index 8810f2fa3d5293b79785a5feacefb0f53e43358a..b00f64c3db6bfa3dcbf374a13aaa1e21df9048b5 100644 --- a/spec/requests/api/graphql/project/repository_spec.rb +++ b/spec/requests/api/graphql/project/repository_spec.rb @@ -5,7 +5,7 @@ include GraphqlHelpers let(:project) { create(:project, :repository) } - let(:current_user) { project.owner } + let(:current_user) { project.first_owner } let(:fields) do <<~QUERY #{all_graphql_fields_for('repository'.classify)} diff --git a/spec/requests/api/graphql/project/tree/tree_spec.rb b/spec/requests/api/graphql/project/tree/tree_spec.rb index f4cd316da96f72acc93eb4b8c930637fc527474f..25e878a5b1afabf684e38bcbc837d416302cb5a2 100644 --- a/spec/requests/api/graphql/project/tree/tree_spec.rb +++ b/spec/requests/api/graphql/project/tree/tree_spec.rb @@ -5,7 +5,7 @@ include GraphqlHelpers let(:project) { create(:project, :repository) } - let(:current_user) { project.owner } + let(:current_user) { project.first_owner } let(:path) { "" } let(:ref) { "master" } let(:fields) do diff --git a/spec/requests/api/markdown_spec.rb b/spec/requests/api/markdown_spec.rb index faf671d350f18879b88dccb3cb3965765d5bbb7e..0488bce466338969012e05601c9ce62dcd99c50c 100644 --- a/spec/requests/api/markdown_spec.rb +++ b/spec/requests/api/markdown_spec.rb @@ -71,7 +71,7 @@ end context "when authorized" do - let(:user) { project.owner } + let(:user) { project.first_owner } it_behaves_like "rendered markdown text without GFM" end @@ -97,7 +97,7 @@ context "with project" do let(:params) { { text: text, gfm: true, project: project.full_path } } - let(:user) { project.owner } + let(:user) { project.first_owner } it "renders markdown text" do expect(response).to have_gitlab_http_status(:created) diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 0a90be4a0682c8f30b64f177983e8e350314e68f..2a266ff5d19cec57be118651fbd472da00c16988 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -2896,7 +2896,7 @@ it 'is false for an unauthorized user' do expect do - put api("/projects/#{target_project.id}/merge_requests/#{merge_request.iid}", target_project.owner), params: { state_event: 'close', remove_source_branch: true } + put api("/projects/#{target_project.id}/merge_requests/#{merge_request.iid}", target_project.first_owner), params: { state_event: 'close', remove_source_branch: true } end.not_to change { merge_request.reload.merge_params } expect(response).to have_gitlab_http_status(:ok) diff --git a/spec/requests/api/project_export_spec.rb b/spec/requests/api/project_export_spec.rb index b9c458373a87bfeddd2e72c997ea32f58c92bc20..2bc31153f2cb0ac8cec84c24ffe4d00324d0c9a3 100644 --- a/spec/requests/api/project_export_spec.rb +++ b/spec/requests/api/project_export_spec.rb @@ -450,7 +450,7 @@ expect_next_instance_of(Projects::ImportExport::ExportService) do |service| expect(service).to receive(:execute) end - post api(path, project.owner), params: params + post api(path, project.first_owner), params: params expect(response).to have_gitlab_http_status(:accepted) end diff --git a/spec/requests/api/project_snapshots_spec.rb b/spec/requests/api/project_snapshots_spec.rb index 33c86d56ed48ccb23c6ccb324e25690554de6ad0..bf78ff56206f4c5f3140b4d0229f97f12d62c678 100644 --- a/spec/requests/api/project_snapshots_spec.rb +++ b/spec/requests/api/project_snapshots_spec.rb @@ -33,7 +33,7 @@ def expect_snapshot_response_for(repository) end it 'returns authentication error as project owner' do - get api("/projects/#{project.id}/snapshot", project.owner) + get api("/projects/#{project.id}/snapshot", project.first_owner) expect(response).to have_gitlab_http_status(:forbidden) end diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index bf41a808219b16f5518db997513070403cd50563..73c78b85b3bfad7c18bdc085eba23f7354c7dcb4 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -30,7 +30,7 @@ context 'when the languages were detected before' do before do - Projects::DetectRepositoryLanguagesService.new(project, project.owner).execute + Projects::DetectRepositoryLanguagesService.new(project, project.first_owner).execute end it 'returns the detection from the database' do @@ -2710,7 +2710,7 @@ def failure_message(diff) it 'returns the project users' do get api("/projects/#{project.id}/users", current_user) - user = project.namespace.owner + user = project.namespace.first_owner expect(response).to have_gitlab_http_status(:ok) expect(response).to include_pagination_headers diff --git a/spec/requests/boards/lists_controller_spec.rb b/spec/requests/boards/lists_controller_spec.rb index 4d9f1dace4dd471f720b371ea59da13ad9c557e6..47f4925d5b0c9a688c9c99f04ee34223497e6feb 100644 --- a/spec/requests/boards/lists_controller_spec.rb +++ b/spec/requests/boards/lists_controller_spec.rb @@ -5,7 +5,7 @@ RSpec.describe Boards::ListsController do describe '#index' do let(:board) { create(:board) } - let(:user) { board.project.owner } + let(:user) { board.project.first_owner } it 'does not have N+1 queries' do login_as(user) diff --git a/spec/requests/import/gitlab_projects_controller_spec.rb b/spec/requests/import/gitlab_projects_controller_spec.rb index 58843a7fec471481ee3be242595f993e18ba207e..eed035608d0cfc558736b6fb975d4f591ba782c7 100644 --- a/spec/requests/import/gitlab_projects_controller_spec.rb +++ b/spec/requests/import/gitlab_projects_controller_spec.rb @@ -8,7 +8,7 @@ include_context 'workhorse headers' let_it_be(:namespace) { create(:namespace) } - let_it_be(:user) { namespace.owner } + let_it_be(:user) { namespace.first_owner } before do login_as(user) diff --git a/spec/requests/projects/clusters/integrations_controller_spec.rb b/spec/requests/projects/clusters/integrations_controller_spec.rb index 323c61b9af31624f9f6c511eca5dda1eb08fe1d7..c05e3da675c48a3db0a02d6fafb2cd72ac3acc70 100644 --- a/spec/requests/projects/clusters/integrations_controller_spec.rb +++ b/spec/requests/projects/clusters/integrations_controller_spec.rb @@ -28,7 +28,7 @@ describe 'POST create_or_update' do let(:cluster) { create(:cluster, :project, :provided_by_gcp) } let(:project) { cluster.project } - let(:user) { project.owner } + let(:user) { project.first_owner } it_behaves_like '#create_or_update action' do let(:path) { create_or_update_project_cluster_integration_path(project, cluster) } diff --git a/spec/requests/projects/merge_requests/creations_spec.rb b/spec/requests/projects/merge_requests/creations_spec.rb index 0a3e663444fdbc5c0ae7e8f4d637bb67cc186a61..842ad01656ed9310a13090082f8a53d295a93fae 100644 --- a/spec/requests/projects/merge_requests/creations_spec.rb +++ b/spec/requests/projects/merge_requests/creations_spec.rb @@ -7,7 +7,7 @@ include ProjectForksHelper let(:project) { create(:project, :repository) } - let(:user) { project.owner } + let(:user) { project.first_owner } before do login_as(user) diff --git a/spec/requests/projects/merge_requests_discussions_spec.rb b/spec/requests/projects/merge_requests_discussions_spec.rb index 6cf7bfb1795facc3b9d79472ab6154d0ddd81f4d..c761af86c162ef9a4f2ee23e1fb43c3363d0e4e0 100644 --- a/spec/requests/projects/merge_requests_discussions_spec.rb +++ b/spec/requests/projects/merge_requests_discussions_spec.rb @@ -6,7 +6,7 @@ # Further tests can be found at merge_requests_controller_spec.rb describe 'GET /:namespace/:project/-/merge_requests/:iid/discussions' do let(:project) { create(:project, :repository, :public) } - let(:owner) { project.owner } + let(:owner) { project.first_owner } let(:user) { create(:user) } let(:merge_request) { create(:merge_request_with_diffs, target_project: project, source_project: project) } diff --git a/spec/requests/projects/merge_requests_spec.rb b/spec/requests/projects/merge_requests_spec.rb index 59fde8035601b4b27bec77ee8d3b7a2768de23a3..91153554e5595470d580276f3a6868d98ed937eb 100644 --- a/spec/requests/projects/merge_requests_spec.rb +++ b/spec/requests/projects/merge_requests_spec.rb @@ -12,7 +12,7 @@ reviewers: [user2]) end - let(:user) { project.owner } + let(:user) { project.first_owner } let(:user2) { create(:user) } before do diff --git a/spec/requests/projects/metrics_dashboard_spec.rb b/spec/requests/projects/metrics_dashboard_spec.rb index c248463faa391e68cc510001d8512e2ce3338308..61bfe1c6edf75131420608182982a0174777ba1f 100644 --- a/spec/requests/projects/metrics_dashboard_spec.rb +++ b/spec/requests/projects/metrics_dashboard_spec.rb @@ -6,7 +6,7 @@ let_it_be(:project) { create(:project) } let_it_be(:environment) { create(:environment, project: project) } let_it_be(:environment2) { create(:environment, project: project) } - let_it_be(:user) { project.owner } + let_it_be(:user) { project.first_owner } before do project.add_developer(user) diff --git a/spec/requests/projects/noteable_notes_spec.rb b/spec/requests/projects/noteable_notes_spec.rb index 2bf1ffb2edc210b1b8c08a8103a42c3982ab6754..44ee50ca002eb5e710db8aa949de110da5c26763 100644 --- a/spec/requests/projects/noteable_notes_spec.rb +++ b/spec/requests/projects/noteable_notes_spec.rb @@ -9,7 +9,7 @@ let(:etag_store) { Gitlab::EtagCaching::Store.new } let(:notes_path) { project_noteable_notes_path(project, target_type: merge_request.class.name.underscore, target_id: merge_request.id) } let(:project) { merge_request.project } - let(:user) { project.owner } + let(:user) { project.first_owner } let(:response_etag) { response.headers['ETag'] } let(:stored_etag) { "W/\"#{etag_store.get(notes_path)}\"" }