From 8b13b280f53bc4895c2e92b7dae7b23a95480104 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 19 Sep 2023 06:11:52 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../invite_members/mock_data/member_modal.js | 14 ------ .../invite_members/utils/member_utils_spec.js | 12 +---- spec/frontend/tracking/mock_data.js | 2 +- spec/helpers/invite_members_helper_spec.rb | 56 ---------------------- spec/helpers/members_helper_spec.rb | 6 --- .../merge_requests/refresh_service_spec.rb | 7 ++- .../features/content_editor_shared_examples.rb | 3 +- ...d_branches_access_control_ce_shared_examples.rb | 3 +- 8 files changed, 12 insertions(+), 91 deletions(-) (limited to 'spec') diff --git a/spec/frontend/invite_members/mock_data/member_modal.js b/spec/frontend/invite_members/mock_data/member_modal.js index 67fb1dcbfbd..8cde13bf69c 100644 --- a/spec/frontend/invite_members/mock_data/member_modal.js +++ b/spec/frontend/invite_members/mock_data/member_modal.js @@ -6,14 +6,6 @@ export const propsData = { accessLevels: { Guest: 10, Reporter: 20, Developer: 30, Maintainer: 40, Owner: 50 }, defaultAccessLevel: 30, helpLink: 'https://example.com', - tasksToBeDoneOptions: [ - { text: 'First task', value: 'first' }, - { text: 'Second task', value: 'second' }, - ], - projects: [ - { text: 'First project', value: '1' }, - { text: 'Second project', value: '2' }, - ], }; export const inviteSource = 'unknown'; @@ -51,8 +43,6 @@ export const postData = { expires_at: undefined, invite_source: inviteSource, format: 'json', - tasks_to_be_done: [], - tasks_project_id: '', }; export const emailPostData = { @@ -60,8 +50,6 @@ export const emailPostData = { expires_at: undefined, email: `${user3.name}`, invite_source: inviteSource, - tasks_to_be_done: [], - tasks_project_id: '', format: 'json', }; @@ -71,8 +59,6 @@ export const singleUserPostData = { user_id: `${user1.id}`, email: `${user3.name}`, invite_source: inviteSource, - tasks_to_be_done: [], - tasks_project_id: '', format: 'json', }; diff --git a/spec/frontend/invite_members/utils/member_utils_spec.js b/spec/frontend/invite_members/utils/member_utils_spec.js index 988715fe309..abae43c3dbb 100644 --- a/spec/frontend/invite_members/utils/member_utils_spec.js +++ b/spec/frontend/invite_members/utils/member_utils_spec.js @@ -1,8 +1,4 @@ -import { - memberName, - triggerExternalAlert, - qualifiesForTasksToBeDone, -} from '~/invite_members/utils/member_utils'; +import { memberName, triggerExternalAlert } from '~/invite_members/utils/member_utils'; jest.mock('~/lib/utils/url_utility'); @@ -22,9 +18,3 @@ describe('Trigger External Alert', () => { expect(triggerExternalAlert()).toBe(false); }); }); - -describe('Qualifies For Tasks To Be Done', () => { - it('returns false', () => { - expect(qualifiesForTasksToBeDone()).toBe(false); - }); -}); diff --git a/spec/frontend/tracking/mock_data.js b/spec/frontend/tracking/mock_data.js index d7745fc0823..acde8676291 100644 --- a/spec/frontend/tracking/mock_data.js +++ b/spec/frontend/tracking/mock_data.js @@ -9,7 +9,7 @@ export const extraContext = { }; export const servicePingContext = { - schema: 'iglu:com.gitlab/gitlab_service_ping/jsonschema/1-0-0', + schema: 'iglu:com.gitlab/gitlab_service_ping/jsonschema/1-0-1', data: { event_name: 'track_incident_event', data_source: 'redis_hll', diff --git a/spec/helpers/invite_members_helper_spec.rb b/spec/helpers/invite_members_helper_spec.rb index abf8b65dc1e..7cf9ffa0621 100644 --- a/spec/helpers/invite_members_helper_spec.rb +++ b/spec/helpers/invite_members_helper_spec.rb @@ -65,62 +65,6 @@ RSpec.describe InviteMembersHelper do expect(helper.common_invite_modal_dataset(project)).to include(attributes) end - - context 'with tasks_to_be_done' do - using RSpec::Parameterized::TableSyntax - - subject(:output) { helper.common_invite_modal_dataset(source) } - - shared_examples_for 'including the tasks to be done attributes' do - it 'includes the tasks to be done attributes when expected' do - if expected? - expect(output[:tasks_to_be_done_options]).to eq( - [ - { value: :code, text: 'Create/import code into a project (repository)' }, - { value: :ci, text: 'Set up CI/CD pipelines to build, test, deploy, and monitor code' }, - { value: :issues, text: 'Create/import issues (tickets) to collaborate on ideas and plan work' } - ].to_json - ) - expect(output[:projects]).to eq([{ id: project.id, title: project.title }].to_json) - expect(output[:new_project_path]).to eq( - source.is_a?(Project) ? '' : new_project_path(namespace_id: group.id) - ) - else - expect(output[:tasks_to_be_done_options]).to be_nil - expect(output[:projects]).to be_nil - expect(output[:new_project_path]).to be_nil - end - end - end - - context 'when inviting members for tasks' do - where(:open_modal_param?, :logged_in?, :expected?) do - true | true | true - true | false | false - false | true | false - false | false | false - end - - with_them do - before do - allow(helper).to receive(:current_user).and_return(developer) if logged_in? - allow(helper).to receive(:params).and_return({ open_modal: 'invite_members_for_task' }) if open_modal_param? - end - - context 'when the source is a project' do - let_it_be(:source) { project } - - it_behaves_like 'including the tasks to be done attributes' - end - - context 'when the source is a group' do - let_it_be(:source) { group } - - it_behaves_like 'including the tasks to be done attributes' - end - end - end - end end context 'with project' do diff --git a/spec/helpers/members_helper_spec.rb b/spec/helpers/members_helper_spec.rb index 005fce1730f..68a12d8dbf7 100644 --- a/spec/helpers/members_helper_spec.rb +++ b/spec/helpers/members_helper_spec.rb @@ -69,12 +69,6 @@ RSpec.describe MembersHelper do it { expect(leave_confirmation_message(group)).to eq "Are you sure you want to leave the \"#{group.name}\" group?" } end - describe '#localized_tasks_to_be_done_choices' do - it 'has a translation for all `TASKS_TO_BE_DONE` keys' do - expect(localized_tasks_to_be_done_choices).to include(*MemberTask::TASKS.keys) - end - end - describe '#member_request_access_link' do let(:project) { create(:project) } let(:group) { create(:group) } diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb index 06932af26dc..d5b7b56ccdd 100644 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ b/spec/services/merge_requests/refresh_service_spec.rb @@ -913,7 +913,7 @@ RSpec.describe MergeRequests::RefreshService, feature_category: :code_review_wor subject { service.execute(oldrev, newrev, 'refs/heads/merge-commit-analyze-before') } context 'feature enabled' do - it "updates merge requests' merge_commits" do + it "updates merge requests' merge_commit and merged_commit values", :aggregate_failures do expect(Gitlab::BranchPushMergeCommitAnalyzer).to receive(:new).and_wrap_original do |original_method, commits| expect(commits.map(&:id)).to eq(%w{646ece5cfed840eca0a4feb21bcd6a81bb19bda3 29284d9bcc350bcae005872d0be6edd016e2efb5 5f82584f0a907f3b30cfce5bb8df371454a90051 8a994512e8c8f0dfcf22bb16df6e876be7a61036 689600b91aabec706e657e38ea706ece1ee8268f db46a1c5a5e474aa169b6cdb7a522d891bc4c5f9}) @@ -927,6 +927,11 @@ RSpec.describe MergeRequests::RefreshService, feature_category: :code_review_wor expect(merge_request.merge_commit.id).to eq('646ece5cfed840eca0a4feb21bcd6a81bb19bda3') expect(merge_request_side_branch.merge_commit.id).to eq('29284d9bcc350bcae005872d0be6edd016e2efb5') + # we need to use read_attribute to bypass the overridden + # #merged_commit_sha method, which contains a fallback to + # #merge_commit_sha + expect(merge_request.read_attribute(:merged_commit_sha)).to eq('646ece5cfed840eca0a4feb21bcd6a81bb19bda3') + expect(merge_request_side_branch.read_attribute(:merged_commit_sha)).to eq('29284d9bcc350bcae005872d0be6edd016e2efb5') end end end diff --git a/spec/support/shared_examples/features/content_editor_shared_examples.rb b/spec/support/shared_examples/features/content_editor_shared_examples.rb index fff8ef915eb..3e81f969462 100644 --- a/spec/support/shared_examples/features/content_editor_shared_examples.rb +++ b/spec/support/shared_examples/features/content_editor_shared_examples.rb @@ -244,7 +244,8 @@ RSpec.shared_examples 'edits content using the content editor' do |params = { wi end end - it 'expands the link, updates the link attributes and text if text is updated' do + it 'expands the link, updates the link attributes and text if text is updated', + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/419684' do page.within '[data-testid="link-bubble-menu"]' do fill_in 'link-text', with: 'new text' fill_in 'link-href', with: 'https://about.gitlab.com' diff --git a/spec/support/shared_examples/features/protected_branches_access_control_ce_shared_examples.rb b/spec/support/shared_examples/features/protected_branches_access_control_ce_shared_examples.rb index 10e0fe8c40e..39db3b701d9 100644 --- a/spec/support/shared_examples/features/protected_branches_access_control_ce_shared_examples.rb +++ b/spec/support/shared_examples/features/protected_branches_access_control_ce_shared_examples.rb @@ -31,7 +31,8 @@ RSpec.shared_examples "protected branches > access control > CE" do expect(ProtectedBranch.last.merge_access_levels.map(&:access_level)).to eq([access_type_id]) end - it "allows updating protected branches so that #{access_type_name} can push to them" do + it "allows updating protected branches so that #{access_type_name} can push to them", + quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/425080' do visit project_protected_branches_path(project) show_add_form -- cgit v1.2.3