diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-19 12:08:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-19 12:08:58 +0300 |
commit | 93e4425400aa60f54f1bbccb26ef6581503952f3 (patch) | |
tree | 60ec09e58a7ba58d3d795ddc12803d40471b758d /spec | |
parent | 731d58455c61ad6400924171eb182f2c2ab2f0a4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
11 files changed, 60 insertions, 12 deletions
diff --git a/spec/frontend/api_spec.js b/spec/frontend/api_spec.js index 07d811ab30d..9924525929b 100644 --- a/spec/frontend/api_spec.js +++ b/spec/frontend/api_spec.js @@ -421,6 +421,25 @@ describe('Api', () => { }); }); + describe('addProjectIssueAsTodo', () => { + it('adds issue ID as a todo', () => { + const projectId = 1; + const issueIid = 11; + const expectedUrl = `${dummyUrlRoot}/api/${dummyApiVersion}/projects/1/issues/11/todo`; + mock.onPost(expectedUrl).reply(200, { + id: 112, + project: { + id: 1, + }, + }); + + return Api.addProjectIssueAsTodo(projectId, issueIid).then(({ data }) => { + expect(data.id).toBe(112); + expect(data.project.id).toBe(projectId); + }); + }); + }); + describe('newLabel', () => { it('creates a new label', done => { const namespace = 'some namespace'; diff --git a/spec/frontend/blob/pipeline_tour_success_modal_spec.js b/spec/frontend/blob/pipeline_tour_success_modal_spec.js index 50db1675e13..a02c968c4b5 100644 --- a/spec/frontend/blob/pipeline_tour_success_modal_spec.js +++ b/spec/frontend/blob/pipeline_tour_success_modal_spec.js @@ -16,6 +16,7 @@ describe('PipelineTourSuccessModal', () => { stubs: { GlModal, GlSprintf, + 'gl-emoji': '<img/>', }, }); }; @@ -66,9 +67,11 @@ describe('PipelineTourSuccessModal', () => { it('has expected structure', () => { const modal = wrapper.find(GlModal); const sprintf = modal.find(GlSprintf); + const emoji = modal.find('img'); - expect(modal.attributes('title')).toContain("That's it, well done!"); + expect(wrapper.text()).toContain("That's it, well done!"); expect(sprintf.exists()).toBe(true); + expect(emoji.exists()).toBe(true); }); it('renders the link for codeQualityLink', () => { diff --git a/spec/frontend/diffs/components/diff_file_header_spec.js b/spec/frontend/diffs/components/diff_file_header_spec.js index 3a236228c40..a04486fc5c7 100644 --- a/spec/frontend/diffs/components/diff_file_header_spec.js +++ b/spec/frontend/diffs/components/diff_file_header_spec.js @@ -20,7 +20,7 @@ const diffFile = Object.freeze( name: 'base.js', mode: '100644', readable_text: true, - icon: 'file-text-o', + icon: 'doc-text', }, }), ); diff --git a/spec/frontend/diffs/mock_data/diff_discussions.js b/spec/frontend/diffs/mock_data/diff_discussions.js index 94a689c33fc..eff949bfb0d 100644 --- a/spec/frontend/diffs/mock_data/diff_discussions.js +++ b/spec/frontend/diffs/mock_data/diff_discussions.js @@ -260,7 +260,7 @@ export default { name: 'CHANGELOG', mode: '100644', readable_text: true, - icon: 'file-text-o', + icon: 'doc-text', }, blob_path: 'CHANGELOG', blob_name: 'CHANGELOG', diff --git a/spec/frontend/diffs/mock_data/diff_file.js b/spec/frontend/diffs/mock_data/diff_file.js index fdda3aecd8f..d3886819a91 100644 --- a/spec/frontend/diffs/mock_data/diff_file.js +++ b/spec/frontend/diffs/mock_data/diff_file.js @@ -7,7 +7,7 @@ export default { name: 'CHANGELOG', mode: '100644', readable_text: true, - icon: 'file-text-o', + icon: 'doc-text', }, blob_path: 'CHANGELOG', blob_name: 'CHANGELOG', diff --git a/spec/frontend/diffs/mock_data/diff_file_unreadable.js b/spec/frontend/diffs/mock_data/diff_file_unreadable.js index 17cbfe3e080..f6cdca9950a 100644 --- a/spec/frontend/diffs/mock_data/diff_file_unreadable.js +++ b/spec/frontend/diffs/mock_data/diff_file_unreadable.js @@ -7,7 +7,7 @@ export default { name: 'CHANGELOG', mode: '100644', readable_text: false, - icon: 'file-text-o', + icon: 'doc-text', }, blob_path: 'CHANGELOG', blob_name: 'CHANGELOG', diff --git a/spec/frontend/issuable_list/mock_data.js b/spec/frontend/issuable_list/mock_data.js index f6f914a595d..8eab2ca6f94 100644 --- a/spec/frontend/issuable_list/mock_data.js +++ b/spec/frontend/issuable_list/mock_data.js @@ -30,13 +30,23 @@ export const mockScopedLabel = { export const mockLabels = [mockRegularLabel, mockScopedLabel]; +export const mockCurrentUserTodo = { + id: 'gid://gitlab/Todo/489', + state: 'done', +}; + export const mockIssuable = { iid: '30', title: 'Dismiss Cipher with no integrity', - description: null, + titleHtml: 'Dismiss Cipher with no integrity', + description: 'fortitudinis _fomentis_ dolor mitigari solet.', + descriptionHtml: 'fortitudinis <i>fomentis</i> dolor mitigari solet.', + state: 'opened', createdAt: '2020-06-29T13:52:56Z', updatedAt: '2020-09-10T11:41:13Z', webUrl: 'http://0.0.0.0:3000/gitlab-org/gitlab-shell/-/issues/30', + blocked: false, + confidential: false, author: mockAuthor, labels: { nodes: mockLabels, diff --git a/spec/frontend/lib/utils/datetime_utility_spec.js b/spec/frontend/lib/utils/datetime_utility_spec.js index d168de5bf8b..b0b0b028761 100644 --- a/spec/frontend/lib/utils/datetime_utility_spec.js +++ b/spec/frontend/lib/utils/datetime_utility_spec.js @@ -682,6 +682,20 @@ describe('differenceInSeconds', () => { }); }); +describe('differenceInMonths', () => { + const startDateTime = new Date('2019-07-17T00:00:00.000Z'); + + it.each` + startDate | endDate | expected + ${startDateTime} | ${startDateTime} | ${0} + ${startDateTime} | ${new Date('2019-12-17T12:00:00.000Z')} | ${5} + ${startDateTime} | ${new Date('2021-02-18T00:00:00.000Z')} | ${19} + ${new Date('2021-02-18T00:00:00.000Z')} | ${startDateTime} | ${-19} + `('returns $expected for $endDate - $startDate', ({ startDate, endDate, expected }) => { + expect(datetimeUtility.differenceInMonths(startDate, endDate)).toBe(expected); + }); +}); + describe('differenceInMilliseconds', () => { const startDateTime = new Date('2019-07-17T00:00:00.000Z'); diff --git a/spec/frontend/vue_mr_widget/mr_widget_options_spec.js b/spec/frontend/vue_mr_widget/mr_widget_options_spec.js index 238023be0be..25c967996e3 100644 --- a/spec/frontend/vue_mr_widget/mr_widget_options_spec.js +++ b/spec/frontend/vue_mr_widget/mr_widget_options_spec.js @@ -536,7 +536,7 @@ describe('mrWidgetOptions', () => { const tooltip = vm.$el.querySelector('[data-testid="question-o-icon"]'); expect(vm.$el.textContent).toContain('Deletes source branch'); - expect(tooltip.getAttribute('data-original-title')).toBe( + expect(tooltip.getAttribute('title')).toBe( 'A user with write access to the source branch selected this option', ); diff --git a/spec/frontend/vue_shared/components/__snapshots__/awards_list_spec.js.snap b/spec/frontend/vue_shared/components/__snapshots__/awards_list_spec.js.snap index 19671d425a9..82503e5a025 100644 --- a/spec/frontend/vue_shared/components/__snapshots__/awards_list_spec.js.snap +++ b/spec/frontend/vue_shared/components/__snapshots__/awards_list_spec.js.snap @@ -228,9 +228,11 @@ exports[`vue_shared/components/awards_list default matches snapshot 1`] = ` /> </span> - <i - aria-hidden="true" - class="fa fa-spinner fa-spin award-control-icon award-control-icon-loading" + <gl-loading-icon-stub + class="award-control-icon-loading" + color="dark" + label="Loading" + size="md" /> </button> </div> diff --git a/spec/models/project_services/chat_message/issue_message_spec.rb b/spec/models/project_services/chat_message/issue_message_spec.rb index 051f4780ba4..4701ef3e49e 100644 --- a/spec/models/project_services/chat_message/issue_message_spec.rb +++ b/spec/models/project_services/chat_message/issue_message_spec.rb @@ -44,7 +44,7 @@ RSpec.describe ChatMessage::IssueMessage do context 'open' do it 'returns a message regarding opening of issues' do expect(subject.pretext).to eq( - '[<http://somewhere.com|project_name>] Issue opened by Test User (test.user)') + '[<http://somewhere.com|project_name>] Issue <http://url.com|#100 Issue title> opened by Test User (test.user)') expect(subject.attachments).to eq([ { title: "#100 Issue title", @@ -91,7 +91,7 @@ RSpec.describe ChatMessage::IssueMessage do context 'open' do it 'returns a message regarding opening of issues' do expect(subject.pretext).to eq( - '[[project_name](http://somewhere.com)] Issue opened by Test User (test.user)') + '[[project_name](http://somewhere.com)] Issue [#100 Issue title](http://url.com) opened by Test User (test.user)') expect(subject.attachments).to eq('issue description') expect(subject.activity).to eq({ title: 'Issue opened by Test User (test.user)', |