From 26090691945ad7d9f67a8f89367de5608d2ff25c Mon Sep 17 00:00:00 2001 From: charlie ablett Date: Fri, 21 Jan 2022 17:23:05 +1300 Subject: [PATCH] Replace owner with first_owner in frontend spec fixtures --- spec/frontend/fixtures/blob.rb | 2 +- spec/frontend/fixtures/branches.rb | 2 +- spec/frontend/fixtures/clusters.rb | 2 +- spec/frontend/fixtures/commit.rb | 2 +- spec/frontend/fixtures/freeze_period.rb | 2 +- spec/frontend/fixtures/jobs.rb | 2 +- spec/frontend/fixtures/merge_requests.rb | 2 +- spec/frontend/fixtures/merge_requests_diffs.rb | 2 +- spec/frontend/fixtures/pipeline_schedules.rb | 2 +- spec/frontend/fixtures/projects.rb | 2 +- spec/frontend/fixtures/prometheus_service.rb | 2 +- spec/frontend/fixtures/services.rb | 2 +- spec/frontend/fixtures/snippet.rb | 2 +- spec/frontend/fixtures/tags.rb | 2 +- spec/frontend/fixtures/todos.rb | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/spec/frontend/fixtures/blob.rb b/spec/frontend/fixtures/blob.rb index 35a7ff4eb07713..af5488238860e3 100644 --- a/spec/frontend/fixtures/blob.rb +++ b/spec/frontend/fixtures/blob.rb @@ -7,7 +7,7 @@ let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let(:project) { create(:project, :repository, namespace: namespace, path: 'branches-project') } - let(:user) { project.owner } + let(:user) { project.first_owner } render_views diff --git a/spec/frontend/fixtures/branches.rb b/spec/frontend/fixtures/branches.rb index 828564977e0a18..b3bb4b8873ad05 100644 --- a/spec/frontend/fixtures/branches.rb +++ b/spec/frontend/fixtures/branches.rb @@ -7,7 +7,7 @@ let_it_be(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let_it_be(:project) { create(:project, :repository, namespace: namespace, path: 'branches-project') } - let_it_be(:user) { project.owner } + let_it_be(:user) { project.first_owner } after(:all) do remove_repository(project) diff --git a/spec/frontend/fixtures/clusters.rb b/spec/frontend/fixtures/clusters.rb index ea8835552559df..49596d9877461d 100644 --- a/spec/frontend/fixtures/clusters.rb +++ b/spec/frontend/fixtures/clusters.rb @@ -8,7 +8,7 @@ let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let(:project) { create(:project, :repository, namespace: namespace) } let(:cluster) { create(:cluster, :provided_by_gcp, projects: [project]) } - let(:user) { project.owner } + let(:user) { project.first_owner } render_views diff --git a/spec/frontend/fixtures/commit.rb b/spec/frontend/fixtures/commit.rb index f9e0f604b52fbb..815c140950decd 100644 --- a/spec/frontend/fixtures/commit.rb +++ b/spec/frontend/fixtures/commit.rb @@ -6,7 +6,7 @@ include JavaScriptFixturesHelpers let_it_be(:project) { create(:project, :repository) } - let_it_be(:user) { project.owner } + let_it_be(:user) { project.first_owner } let_it_be(:commit) { project.commit("master") } before do diff --git a/spec/frontend/fixtures/freeze_period.rb b/spec/frontend/fixtures/freeze_period.rb index d9573c8000d1c1..dd16bd81b51d8c 100644 --- a/spec/frontend/fixtures/freeze_period.rb +++ b/spec/frontend/fixtures/freeze_period.rb @@ -7,7 +7,7 @@ include TimeZoneHelper let_it_be(:project) { create(:project, :repository, path: 'freeze-periods-project') } - let_it_be(:user) { project.owner } + let_it_be(:user) { project.first_owner } after(:all) do remove_repository(project) diff --git a/spec/frontend/fixtures/jobs.rb b/spec/frontend/fixtures/jobs.rb index 12584f38629304..3cc874326553d6 100644 --- a/spec/frontend/fixtures/jobs.rb +++ b/spec/frontend/fixtures/jobs.rb @@ -7,7 +7,7 @@ let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let(:project) { create(:project, :repository, namespace: namespace, path: 'builds-project') } - let(:user) { project.owner } + let(:user) { project.first_owner } let(:pipeline) { create(:ci_empty_pipeline, project: project, sha: project.commit.id) } let!(:build_with_artifacts) { create(:ci_build, :success, :artifacts, :trace_artifact, pipeline: pipeline, stage: 'test', artifacts_expire_at: Time.now + 18.months) } let!(:failed_build) { create(:ci_build, :failed, pipeline: pipeline, stage: 'build') } diff --git a/spec/frontend/fixtures/merge_requests.rb b/spec/frontend/fixtures/merge_requests.rb index 68ed2ca2359b38..a38f5659b73c88 100644 --- a/spec/frontend/fixtures/merge_requests.rb +++ b/spec/frontend/fixtures/merge_requests.rb @@ -7,7 +7,7 @@ let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let(:project) { create(:project, :repository, namespace: namespace, path: 'merge-requests-project') } - let(:user) { project.owner } + let(:user) { project.first_owner } # rubocop: disable Layout/TrailingWhitespace let(:description) do diff --git a/spec/frontend/fixtures/merge_requests_diffs.rb b/spec/frontend/fixtures/merge_requests_diffs.rb index e733764f248e5e..7f0d650b7108ed 100644 --- a/spec/frontend/fixtures/merge_requests_diffs.rb +++ b/spec/frontend/fixtures/merge_requests_diffs.rb @@ -7,7 +7,7 @@ let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let(:project) { create(:project, :repository, namespace: namespace, path: 'merge-requests-project') } - let(:user) { project.owner } + let(:user) { project.first_owner } let(:merge_request) { create(:merge_request, source_project: project, target_project: project, description: '- [ ] Task List Item') } let(:path) { "files/ruby/popen.rb" } let(:position) do diff --git a/spec/frontend/fixtures/pipeline_schedules.rb b/spec/frontend/fixtures/pipeline_schedules.rb index 6389f59aa0a9d4..e155d27920dd6c 100644 --- a/spec/frontend/fixtures/pipeline_schedules.rb +++ b/spec/frontend/fixtures/pipeline_schedules.rb @@ -7,7 +7,7 @@ let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let(:project) { create(:project, :public, :repository) } - let(:user) { project.owner } + let(:user) { project.first_owner } let!(:pipeline_schedule) { create(:ci_pipeline_schedule, project: project, owner: user) } let!(:pipeline_schedule_populated) { create(:ci_pipeline_schedule, project: project, owner: user) } let!(:pipeline_schedule_variable1) { create(:ci_pipeline_schedule_variable, key: 'foo', value: 'foovalue', pipeline_schedule: pipeline_schedule_populated) } diff --git a/spec/frontend/fixtures/projects.rb b/spec/frontend/fixtures/projects.rb index 3c8964d398ad64..fa7d61df3e8281 100644 --- a/spec/frontend/fixtures/projects.rb +++ b/spec/frontend/fixtures/projects.rb @@ -12,7 +12,7 @@ let(:project) { create(:project, namespace: namespace, path: 'builds-project', runners_token: runners_token, avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png')) } let(:project_with_repo) { create(:project, :repository, description: 'Code and stuff', avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png')) } let(:project_variable_populated) { create(:project, namespace: namespace, path: 'builds-project2', runners_token: runners_token) } - let(:user) { project.owner } + let(:user) { project.first_owner } render_views diff --git a/spec/frontend/fixtures/prometheus_service.rb b/spec/frontend/fixtures/prometheus_service.rb index bbd938c66f6e04..aed73dc1096349 100644 --- a/spec/frontend/fixtures/prometheus_service.rb +++ b/spec/frontend/fixtures/prometheus_service.rb @@ -8,7 +8,7 @@ let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let(:project) { create(:project_empty_repo, namespace: namespace, path: 'services-project') } let!(:integration) { create(:prometheus_integration, project: project) } - let(:user) { project.owner } + let(:user) { project.first_owner } render_views diff --git a/spec/frontend/fixtures/services.rb b/spec/frontend/fixtures/services.rb index a8293a080a90c7..f0bb8fb962fced 100644 --- a/spec/frontend/fixtures/services.rb +++ b/spec/frontend/fixtures/services.rb @@ -8,7 +8,7 @@ let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let(:project) { create(:project_empty_repo, namespace: namespace, path: 'services-project') } let!(:service) { create(:custom_issue_tracker_integration, project: project) } - let(:user) { project.owner } + let(:user) { project.first_owner } render_views diff --git a/spec/frontend/fixtures/snippet.rb b/spec/frontend/fixtures/snippet.rb index 397fb3e7124a8f..f05ff3ee269121 100644 --- a/spec/frontend/fixtures/snippet.rb +++ b/spec/frontend/fixtures/snippet.rb @@ -7,7 +7,7 @@ let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let(:project) { create(:project, :repository, namespace: namespace, path: 'branches-project') } - let(:user) { project.owner } + let(:user) { project.first_owner } let(:snippet) { create(:personal_snippet, :public, title: 'snippet.md', content: '# snippet', file_name: 'snippet.md', author: user) } render_views diff --git a/spec/frontend/fixtures/tags.rb b/spec/frontend/fixtures/tags.rb index 6cfa5f82efe567..fdf85844ee242b 100644 --- a/spec/frontend/fixtures/tags.rb +++ b/spec/frontend/fixtures/tags.rb @@ -6,7 +6,7 @@ include JavaScriptFixturesHelpers let_it_be(:project) { create(:project, :repository, path: 'tags-project') } - let_it_be(:user) { project.owner } + let_it_be(:user) { project.first_owner } after(:all) do remove_repository(project) diff --git a/spec/frontend/fixtures/todos.rb b/spec/frontend/fixtures/todos.rb index a0573b0b6584f2..7dce09e8f49328 100644 --- a/spec/frontend/fixtures/todos.rb +++ b/spec/frontend/fixtures/todos.rb @@ -7,7 +7,7 @@ let(:namespace) { create(:namespace, name: 'frontend-fixtures' )} let(:project) { create(:project_empty_repo, namespace: namespace, path: 'todos-project') } - let(:user) { project.owner } + let(:user) { project.first_owner } let(:issue_1) { create(:issue, title: 'issue_1', project: project) } let!(:todo_1) { create(:todo, user: user, project: project, target: issue_1, created_at: 5.hours.ago) } let(:issue_2) { create(:issue, title: 'issue_2', project: project) } -- GitLab