From 04fb787e3cd00442bcc2b9eafd8b8507a49728ce Mon Sep 17 00:00:00 2001 From: charlie ablett Date: Fri, 21 Jan 2022 17:17:43 +1300 Subject: [PATCH] Replace owner with first_owner in finder specs --- spec/finders/autocomplete/users_finder_spec.rb | 9 ++++++--- .../ci/daily_build_group_report_results_finder_spec.rb | 2 +- spec/finders/merge_request_target_project_finder_spec.rb | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/spec/finders/autocomplete/users_finder_spec.rb b/spec/finders/autocomplete/users_finder_spec.rb index 28bd7e12916d53..df7a14d440e439 100644 --- a/spec/finders/autocomplete/users_finder_spec.rb +++ b/spec/finders/autocomplete/users_finder_spec.rb @@ -3,6 +3,9 @@ require 'spec_helper' RSpec.describe Autocomplete::UsersFinder do + # TODO update when multiple owners are possible in projects + # https://gitlab.com/gitlab-org/gitlab/-/issues/21432 + describe '#execute' do let!(:user1) { create(:user, username: 'johndoe') } let!(:user2) { create(:user, :blocked, username: 'notsorandom') } @@ -25,19 +28,19 @@ context 'when project passed' do let(:project) { create(:project) } - it { is_expected.to match_array([project.owner]) } + it { is_expected.to match_array([project.first_owner]) } context 'when author_id passed' do context 'and author is active' do let(:params) { { author_id: user1.id } } - it { is_expected.to match_array([project.owner, user1]) } + it { is_expected.to match_array([project.first_owner, user1]) } end context 'and author is blocked' do let(:params) { { author_id: user2.id } } - it { is_expected.to match_array([project.owner]) } + it { is_expected.to match_array([project.first_owner]) } end end end diff --git a/spec/finders/ci/daily_build_group_report_results_finder_spec.rb b/spec/finders/ci/daily_build_group_report_results_finder_spec.rb index cf15a00323bb59..5352cfe5238b7d 100644 --- a/spec/finders/ci/daily_build_group_report_results_finder_spec.rb +++ b/spec/finders/ci/daily_build_group_report_results_finder_spec.rb @@ -6,7 +6,7 @@ describe '#execute' do let_it_be(:project) { create(:project, :private) } let(:user_without_permission) { create(:user) } - let_it_be(:user_with_permission) { project.owner } + let_it_be(:user_with_permission) { project.first_owner } let_it_be(:ref_path) { 'refs/heads/master' } let(:limit) { nil } let_it_be(:default_branch) { false } diff --git a/spec/finders/merge_request_target_project_finder_spec.rb b/spec/finders/merge_request_target_project_finder_spec.rb index 08fbfd7229aec3..bf735152d99cab 100644 --- a/spec/finders/merge_request_target_project_finder_spec.rb +++ b/spec/finders/merge_request_target_project_finder_spec.rb @@ -65,8 +65,8 @@ context 'private projects' do let(:base_project) { create(:project, :private, path: 'base') } - let(:forked_project) { fork_project(base_project, base_project.owner) } - let(:other_fork) { fork_project(base_project, base_project.owner) } + let(:forked_project) { fork_project(base_project, base_project.first_owner) } + let(:other_fork) { fork_project(base_project, base_project.first_owner) } context 'when the user is a member of all projects' do before do -- GitLab