From 6ed4ec3e0b1340f96b7c043ef51d1b33bbe85fde Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 19 Sep 2022 23:18:09 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-4-stable-ee --- .../components/accessibility_issue_body_spec.js | 8 ++--- .../grouped_accessibility_reports_app_spec.js | 2 +- .../components/codequality_issue_body_spec.js | 2 +- .../grouped_codequality_reports_app_spec.js | 2 +- .../reports/components/grouped_issues_list_spec.js | 8 ++--- .../reports/components/report_item_spec.js | 4 +-- .../grouped_test_report/components/modal_spec.js | 4 ++- .../grouped_test_report/store/actions_spec.js | 4 +-- .../new_failures_with_null_files_report.json | 40 ++++++++++++++++++++++ 9 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 spec/frontend/reports/mock_data/new_failures_with_null_files_report.json (limited to 'spec/frontend/reports') diff --git a/spec/frontend/reports/accessibility_report/components/accessibility_issue_body_spec.js b/spec/frontend/reports/accessibility_report/components/accessibility_issue_body_spec.js index ddabb7194cb..d835ca4c733 100644 --- a/spec/frontend/reports/accessibility_report/components/accessibility_issue_body_spec.js +++ b/spec/frontend/reports/accessibility_report/components/accessibility_issue_body_spec.js @@ -41,7 +41,7 @@ describe('CustomMetricsForm', () => { }); it('Displays the issue message', () => { - const description = wrapper.find({ ref: 'accessibility-issue-description' }).text(); + const description = wrapper.findComponent({ ref: 'accessibility-issue-description' }).text(); expect(description).toContain(`Message: ${issue.message}`); }); @@ -49,7 +49,7 @@ describe('CustomMetricsForm', () => { describe('When an issue code is present', () => { it('Creates the correct URL for learning more about the issue code', () => { const learnMoreUrl = wrapper - .find({ ref: 'accessibility-issue-learn-more' }) + .findComponent({ ref: 'accessibility-issue-learn-more' }) .attributes('href'); expect(learnMoreUrl).toBe(issue.learnMoreUrl); @@ -66,7 +66,7 @@ describe('CustomMetricsForm', () => { it('Creates a URL leading to the overview documentation page', () => { const learnMoreUrl = wrapper - .find({ ref: 'accessibility-issue-learn-more' }) + .findComponent({ ref: 'accessibility-issue-learn-more' }) .attributes('href'); expect(learnMoreUrl).toBe('https://www.w3.org/TR/WCAG20-TECHS/Overview.html'); @@ -83,7 +83,7 @@ describe('CustomMetricsForm', () => { it('Creates a URL leading to the overview documentation page', () => { const learnMoreUrl = wrapper - .find({ ref: 'accessibility-issue-learn-more' }) + .findComponent({ ref: 'accessibility-issue-learn-more' }) .attributes('href'); expect(learnMoreUrl).toBe('https://www.w3.org/TR/WCAG20-TECHS/Overview.html'); 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 34b1cdd92bc..9d3535291eb 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 @@ -114,7 +114,7 @@ describe('Grouped accessibility reports app', () => { }); it('renders custom accessibility issue body', () => { - const issueBody = wrapper.find(AccessibilityIssueBody); + const issueBody = wrapper.findComponent(AccessibilityIssueBody); expect(issueBody.props('issue').code).toBe(mockReport.new_errors[0].code); expect(issueBody.props('issue').message).toBe(mockReport.new_errors[0].message); diff --git a/spec/frontend/reports/codequality_report/components/codequality_issue_body_spec.js b/spec/frontend/reports/codequality_report/components/codequality_issue_body_spec.js index 17f07ac2b8f..c32b52d9e77 100644 --- a/spec/frontend/reports/codequality_report/components/codequality_issue_body_spec.js +++ b/spec/frontend/reports/codequality_report/components/codequality_issue_body_spec.js @@ -8,7 +8,7 @@ describe('code quality issue body issue body', () => { let wrapper; const findSeverityIcon = () => wrapper.findByTestId('codequality-severity-icon'); - const findGlIcon = () => wrapper.find(GlIcon); + const findGlIcon = () => wrapper.findComponent(GlIcon); const codequalityIssue = { name: 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 b61b65c2713..962ff068b92 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 @@ -30,7 +30,7 @@ describe('Grouped code quality reports app', () => { }; const findWidget = () => wrapper.find('.js-codequality-widget'); - const findIssueBody = () => wrapper.find(CodequalityIssueBody); + const findIssueBody = () => wrapper.findComponent(CodequalityIssueBody); beforeEach(() => { const { state, ...storeConfig } = getStoreConfig(); diff --git a/spec/frontend/reports/components/grouped_issues_list_spec.js b/spec/frontend/reports/components/grouped_issues_list_spec.js index 95ef0bcbcc7..6c0275dc47d 100644 --- a/spec/frontend/reports/components/grouped_issues_list_spec.js +++ b/spec/frontend/reports/components/grouped_issues_list_spec.js @@ -30,7 +30,7 @@ describe('Grouped Issues List', () => { }, }); - expect(wrapper.find(SmartVirtualList).props()).toMatchSnapshot(); + expect(wrapper.findComponent(SmartVirtualList).props()).toMatchSnapshot(); }); describe('without data', () => { @@ -43,7 +43,7 @@ describe('Grouped Issues List', () => { }); it.each(['resolved', 'unresolved'])('does not render report items for %s issues', () => { - expect(wrapper.find(ReportItem).exists()).toBe(false); + expect(wrapper.findComponent(ReportItem).exists()).toBe(false); }); }); @@ -67,7 +67,7 @@ describe('Grouped Issues List', () => { propsData: { [`${issueName}Issues`]: issues }, }); - expect(wrapper.findAll(ReportItem)).toHaveLength(issues.length); + expect(wrapper.findAllComponents(ReportItem)).toHaveLength(issues.length); }); it('renders a report item with the correct props', () => { @@ -81,7 +81,7 @@ describe('Grouped Issues List', () => { }, }); - expect(wrapper.find(ReportItem).props()).toMatchSnapshot(); + expect(wrapper.findComponent(ReportItem).props()).toMatchSnapshot(); }); }); }); diff --git a/spec/frontend/reports/components/report_item_spec.js b/spec/frontend/reports/components/report_item_spec.js index a7243c5377b..b52c163eb26 100644 --- a/spec/frontend/reports/components/report_item_spec.js +++ b/spec/frontend/reports/components/report_item_spec.js @@ -16,7 +16,7 @@ describe('ReportItem', () => { }, }); - expect(wrapper.find(IssueStatusIcon).exists()).toBe(false); + expect(wrapper.findComponent(IssueStatusIcon).exists()).toBe(false); }); it('shows status icon when unspecified', () => { @@ -28,7 +28,7 @@ describe('ReportItem', () => { }, }); - expect(wrapper.find(IssueStatusIcon).exists()).toBe(true); + expect(wrapper.findComponent(IssueStatusIcon).exists()).toBe(true); }); }); }); diff --git a/spec/frontend/reports/grouped_test_report/components/modal_spec.js b/spec/frontend/reports/grouped_test_report/components/modal_spec.js index 3de81f754fd..e8564d2428d 100644 --- a/spec/frontend/reports/grouped_test_report/components/modal_spec.js +++ b/spec/frontend/reports/grouped_test_report/components/modal_spec.js @@ -40,7 +40,9 @@ describe('Grouped Test Reports Modal', () => { }); it('renders code block', () => { - expect(wrapper.find(CodeBlock).props().code).toEqual(modalDataStructure.system_output.value); + expect(wrapper.findComponent(CodeBlock).props().code).toEqual( + modalDataStructure.system_output.value, + ); }); it('renders link', () => { diff --git a/spec/frontend/reports/grouped_test_report/store/actions_spec.js b/spec/frontend/reports/grouped_test_report/store/actions_spec.js index 5876827c548..7469c31cf84 100644 --- a/spec/frontend/reports/grouped_test_report/store/actions_spec.js +++ b/spec/frontend/reports/grouped_test_report/store/actions_spec.js @@ -61,7 +61,7 @@ describe('Reports Store Actions', () => { }); describe('success', () => { - it('dispatches requestReports and receiveReportsSuccess ', () => { + it('dispatches requestReports and receiveReportsSuccess', () => { mock .onGet(`${TEST_HOST}/endpoint.json`) .replyOnce(200, { summary: {}, suites: [{ name: 'rspec' }] }); @@ -89,7 +89,7 @@ describe('Reports Store Actions', () => { mock.onGet(`${TEST_HOST}/endpoint.json`).reply(500); }); - it('dispatches requestReports and receiveReportsError ', () => { + it('dispatches requestReports and receiveReportsError', () => { return testAction( fetchReports, null, diff --git a/spec/frontend/reports/mock_data/new_failures_with_null_files_report.json b/spec/frontend/reports/mock_data/new_failures_with_null_files_report.json new file mode 100644 index 00000000000..28ee7d194b9 --- /dev/null +++ b/spec/frontend/reports/mock_data/new_failures_with_null_files_report.json @@ -0,0 +1,40 @@ +{ + "summary": { "total": 11, "resolved": 0, "errored": 0, "failed": 2 }, + "suites": [ + { + "name": "rspec:pg", + "summary": { "total": 8, "resolved": 0, "errored": 0, "failed": 2 }, + "new_failures": [ + { + "result": "failure", + "name": "Test#sum when a is 1 and b is 2 returns summary", + "file": null, + "execution_time": 0.009411, + "system_output": "Failure/Error: is_expected.to eq(3)\n\n expected: 3\n got: -1\n\n (compared using ==)\n./spec/test_spec.rb:12:in `block (4 levels) in '" + }, + { + "result": "failure", + "name": "Test#sum when a is 100 and b is 200 returns summary", + "file": null, + "execution_time": 0.000162, + "system_output": "Failure/Error: is_expected.to eq(300)\n\n expected: 300\n got: -100\n\n (compared using ==)\n./spec/test_spec.rb:21:in `block (4 levels) in '" + } + ], + "resolved_failures": [], + "existing_failures": [], + "new_errors": [], + "resolved_errors": [], + "existing_errors": [] + }, + { + "name": "java ant", + "summary": { "total": 3, "resolved": 0, "errored": 0, "failed": 0 }, + "new_failures": [], + "resolved_failures": [], + "existing_failures": [], + "new_errors": [], + "resolved_errors": [], + "existing_errors": [] + } + ] +} -- cgit v1.2.1