diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/frontend/reports | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
download | gitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/frontend/reports')
6 files changed, 51 insertions, 27 deletions
diff --git a/spec/frontend/reports/accessibility_report/grouped_accessibility_reports_app_spec.js b/spec/frontend/reports/accessibility_report/grouped_accessibility_reports_app_spec.js index a036588596a..ccceb78f2d1 100644 --- a/spec/frontend/reports/accessibility_report/grouped_accessibility_reports_app_spec.js +++ b/spec/frontend/reports/accessibility_report/grouped_accessibility_reports_app_spec.js @@ -2,7 +2,7 @@ import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; import GroupedAccessibilityReportsApp from '~/reports/accessibility_report/grouped_accessibility_reports_app.vue'; import AccessibilityIssueBody from '~/reports/accessibility_report/components/accessibility_issue_body.vue'; -import store from '~/reports/accessibility_report/store'; +import { getStoreConfig } from '~/reports/accessibility_report/store'; import { mockReport } from './mock_data'; const localVue = createLocalVue(); @@ -20,16 +20,17 @@ describe('Grouped accessibility reports app', () => { propsData: { endpoint: 'endpoint.json', }, - methods: { - fetchReport: () => {}, - }, }); }; const findHeader = () => wrapper.find('[data-testid="report-section-code-text"]'); beforeEach(() => { - mockStore = store(); + mockStore = new Vuex.Store({ + ...getStoreConfig(), + actions: { fetchReport: () => {}, setEndpoint: () => {} }, + }); + mountComponent(); }); diff --git a/spec/frontend/reports/accessibility_report/mock_data.js b/spec/frontend/reports/accessibility_report/mock_data.js index 20ad01bd802..9dace1e7c54 100644 --- a/spec/frontend/reports/accessibility_report/mock_data.js +++ b/spec/frontend/reports/accessibility_report/mock_data.js @@ -1,4 +1,3 @@ -// eslint-disable-next-line import/prefer-default-export export const mockReport = { status: 'failed', summary: { diff --git a/spec/frontend/reports/codequality_report/grouped_codequality_reports_app_spec.js b/spec/frontend/reports/codequality_report/grouped_codequality_reports_app_spec.js index 1905ca0d5e1..77d7c6f8678 100644 --- a/spec/frontend/reports/codequality_report/grouped_codequality_reports_app_spec.js +++ b/spec/frontend/reports/codequality_report/grouped_codequality_reports_app_spec.js @@ -2,7 +2,7 @@ import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; import GroupedCodequalityReportsApp from '~/reports/codequality_report/grouped_codequality_reports_app.vue'; import CodequalityIssueBody from '~/reports/codequality_report/components/codequality_issue_body.vue'; -import store from '~/reports/codequality_report/store'; +import { getStoreConfig } from '~/reports/codequality_report/store'; import { mockParsedHeadIssues, mockParsedBaseIssues } from './mock_data'; const localVue = createLocalVue(); @@ -13,21 +13,22 @@ describe('Grouped code quality reports app', () => { let wrapper; let mockStore; + const PATHS = { + codequalityHelpPath: 'codequality_help.html', + basePath: 'base.json', + headPath: 'head.json', + baseBlobPath: 'base/blob/path/', + headBlobPath: 'head/blob/path/', + }; + const mountComponent = (props = {}) => { wrapper = mount(Component, { store: mockStore, localVue, propsData: { - basePath: 'base.json', - headPath: 'head.json', - baseBlobPath: 'base/blob/path/', - headBlobPath: 'head/blob/path/', - codequalityHelpPath: 'codequality_help.html', + ...PATHS, ...props, }, - methods: { - fetchReports: () => {}, - }, }); }; @@ -35,7 +36,19 @@ describe('Grouped code quality reports app', () => { const findIssueBody = () => wrapper.find(CodequalityIssueBody); beforeEach(() => { - mockStore = store(); + const { state, ...storeConfig } = getStoreConfig(); + mockStore = new Vuex.Store({ + ...storeConfig, + actions: { + setPaths: () => {}, + fetchReports: () => {}, + }, + state: { + ...state, + ...PATHS, + }, + }); + mountComponent(); }); @@ -126,7 +139,11 @@ describe('Grouped code quality reports app', () => { }); it('renders a help icon with more information', () => { - expect(findWidget().html()).toContain('ic-question'); + expect( + findWidget() + .find('[data-testid="question-icon"]') + .exists(), + ).toBe(true); }); }); @@ -140,7 +157,11 @@ describe('Grouped code quality reports app', () => { }); it('does not render a help icon', () => { - expect(findWidget().html()).not.toContain('ic-question'); + expect( + findWidget() + .find('[data-testid="question-icon"]') + .exists(), + ).toBe(false); }); }); }); diff --git a/spec/frontend/reports/components/__snapshots__/issue_status_icon_spec.js.snap b/spec/frontend/reports/components/__snapshots__/issue_status_icon_spec.js.snap index 70e1ff01323..b5a4cb42463 100644 --- a/spec/frontend/reports/components/__snapshots__/issue_status_icon_spec.js.snap +++ b/spec/frontend/reports/components/__snapshots__/issue_status_icon_spec.js.snap @@ -4,7 +4,7 @@ exports[`IssueStatusIcon renders "failed" state correctly 1`] = ` <div class="report-block-list-icon failed" > - <icon-stub + <gl-icon-stub data-qa-selector="status_failed_icon" name="status_failed_borderless" size="24" @@ -16,7 +16,7 @@ exports[`IssueStatusIcon renders "neutral" state correctly 1`] = ` <div class="report-block-list-icon neutral" > - <icon-stub + <gl-icon-stub data-qa-selector="status_neutral_icon" name="dash" size="24" @@ -28,7 +28,7 @@ exports[`IssueStatusIcon renders "success" state correctly 1`] = ` <div class="report-block-list-icon success" > - <icon-stub + <gl-icon-stub data-qa-selector="status_success_icon" name="status_success_borderless" size="24" diff --git a/spec/frontend/reports/components/grouped_issues_list_spec.js b/spec/frontend/reports/components/grouped_issues_list_spec.js index 1f8f4a0e4c1..1172e514707 100644 --- a/spec/frontend/reports/components/grouped_issues_list_spec.js +++ b/spec/frontend/reports/components/grouped_issues_list_spec.js @@ -42,7 +42,7 @@ describe('Grouped Issues List', () => { }); it.each('resolved', 'unresolved')('does not render report items for %s issues', () => { - expect(wrapper.contains(ReportItem)).toBe(false); + expect(wrapper.find(ReportItem).exists()).toBe(false); }); }); diff --git a/spec/frontend/reports/components/grouped_test_reports_app_spec.js b/spec/frontend/reports/components/grouped_test_reports_app_spec.js index c26e2fbc19a..556904b7da5 100644 --- a/spec/frontend/reports/components/grouped_test_reports_app_spec.js +++ b/spec/frontend/reports/components/grouped_test_reports_app_spec.js @@ -1,7 +1,7 @@ import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; import GroupedTestReportsApp from '~/reports/components/grouped_test_reports_app.vue'; -import store from '~/reports/store'; +import { getStoreConfig } from '~/reports/store'; import { failedReport } from '../mock_data/mock_data'; import successTestReports from '../mock_data/no_failures_report.json'; @@ -29,9 +29,6 @@ describe('Grouped test reports app', () => { pipelinePath, ...props, }, - methods: { - fetchReports: () => {}, - }, }); }; @@ -49,7 +46,13 @@ describe('Grouped test reports app', () => { wrapper.findAll('[data-testid="test-issue-body-description"]'); beforeEach(() => { - mockStore = store(); + mockStore = new Vuex.Store({ + ...getStoreConfig(), + actions: { + fetchReports: () => {}, + setEndpoint: () => {}, + }, + }); mountComponent(); }); |