From bfa4e0b43c216ba5f3201058668d3a65743a9910 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 14 Oct 2020 16:34:10 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-4-stable-ee --- spec/features/merge_request/user_expands_diff_spec.rb | 4 ++-- spec/frontend/diffs/components/diff_file_spec.js | 16 ++++++++-------- spec/lib/gitlab/git/pre_receive_error_spec.rb | 16 ++++++++++++---- spec/services/merge_requests/ff_merge_service_spec.rb | 2 +- 4 files changed, 23 insertions(+), 15 deletions(-) (limited to 'spec') diff --git a/spec/features/merge_request/user_expands_diff_spec.rb b/spec/features/merge_request/user_expands_diff_spec.rb index 0e39cce13a1..0340d9ccc3d 100644 --- a/spec/features/merge_request/user_expands_diff_spec.rb +++ b/spec/features/merge_request/user_expands_diff_spec.rb @@ -14,11 +14,11 @@ RSpec.describe 'User expands diff', :js do it 'allows user to expand diff' do page.within find('[id="19763941ab80e8c09871c0a425f0560d9053bcb3"]') do - find('[data-testid="expandButton"]').click + click_link 'Click to expand it.' wait_for_requests - expect(page).not_to have_content('Expand File') + expect(page).not_to have_content('Click to expand it.') expect(page).to have_selector('.code') end end diff --git a/spec/frontend/diffs/components/diff_file_spec.js b/spec/frontend/diffs/components/diff_file_spec.js index 79f0f6bc327..4f1376e2c73 100644 --- a/spec/frontend/diffs/components/diff_file_spec.js +++ b/spec/frontend/diffs/components/diff_file_spec.js @@ -90,8 +90,8 @@ describe('DiffFile', () => { vm.isCollapsed = true; vm.$nextTick(() => { - expect(vm.$el.innerText).toContain('This file is collapsed.'); - expect(vm.$el.querySelector('[data-testid="expandButton"]')).not.toBeFalsy(); + expect(vm.$el.innerText).toContain('This diff is collapsed'); + expect(vm.$el.querySelectorAll('.js-click-to-expand').length).toEqual(1); done(); }); @@ -102,8 +102,8 @@ describe('DiffFile', () => { vm.isCollapsed = true; vm.$nextTick(() => { - expect(vm.$el.innerText).toContain('This file is collapsed.'); - expect(vm.$el.querySelector('[data-testid="expandButton"]')).not.toBeFalsy(); + expect(vm.$el.innerText).toContain('This diff is collapsed'); + expect(vm.$el.querySelectorAll('.js-click-to-expand').length).toEqual(1); done(); }); @@ -121,8 +121,8 @@ describe('DiffFile', () => { vm.isCollapsed = true; vm.$nextTick(() => { - expect(vm.$el.innerText).toContain('This file is collapsed.'); - expect(vm.$el.querySelector('[data-testid="expandButton"]')).not.toBeFalsy(); + expect(vm.$el.innerText).toContain('This diff is collapsed'); + expect(vm.$el.querySelectorAll('.js-click-to-expand').length).toEqual(1); done(); }); @@ -135,7 +135,7 @@ describe('DiffFile', () => { vm.file.viewer.name = diffViewerModes.renamed; vm.$nextTick(() => { - expect(vm.$el.innerText).not.toContain('This file is collapsed.'); + expect(vm.$el.innerText).not.toContain('This diff is collapsed'); done(); }); @@ -148,7 +148,7 @@ describe('DiffFile', () => { vm.file.viewer.name = diffViewerModes.mode_changed; vm.$nextTick(() => { - expect(vm.$el.innerText).not.toContain('This file is collapsed.'); + expect(vm.$el.innerText).not.toContain('This diff is collapsed'); done(); }); diff --git a/spec/lib/gitlab/git/pre_receive_error_spec.rb b/spec/lib/gitlab/git/pre_receive_error_spec.rb index 2ad27361c80..1a10ff56266 100644 --- a/spec/lib/gitlab/git/pre_receive_error_spec.rb +++ b/spec/lib/gitlab/git/pre_receive_error_spec.rb @@ -21,13 +21,21 @@ RSpec.describe Gitlab::Git::PreReceiveError do expect(ex.raw_message).to eq(raw_message) end - it 'sanitizes the user message' do - raw_message = 'Raw message' - ex = described_class.new(raw_message, "#{prefix} User message") + it 'prefers the original message over the fallback' do + raw_message = "#{prefix} Hello,\nworld!" + ex = described_class.new(raw_message, fallback_message: "User message") + expect(ex.message).to eq('Hello,') expect(ex.raw_message).to eq(raw_message) - expect(ex.message).to eq('User message') end end + + it 'uses the fallback message' do + raw_message = 'Hello\n' + ex = described_class.new(raw_message, fallback_message: "User message") + + expect(ex.raw_message).to eq(raw_message) + expect(ex.message).to eq('User message') + end end end diff --git a/spec/services/merge_requests/ff_merge_service_spec.rb b/spec/services/merge_requests/ff_merge_service_spec.rb index 55856deeaca..5c44af87470 100644 --- a/spec/services/merge_requests/ff_merge_service_spec.rb +++ b/spec/services/merge_requests/ff_merge_service_spec.rb @@ -116,7 +116,7 @@ RSpec.describe MergeRequests::FfMergeService do error_message = 'error message' raw_message = 'The truth is out there' - pre_receive_error = Gitlab::Git::PreReceiveError.new(raw_message, "GitLab: #{error_message}") + pre_receive_error = Gitlab::Git::PreReceiveError.new(raw_message, fallback_message: error_message) allow(service).to receive(:repository).and_raise(pre_receive_error) allow(service).to receive(:execute_hooks) expect(Gitlab::ErrorTracking).to receive(:track_exception).with( -- cgit v1.2.3