Commit 3a79b4e7 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch '199115-test-report-copy-changes' into 'master'

Adjust test report text

See merge request gitlab-org/gitlab!36877
parents fb15ee16 879beccf
...@@ -43,7 +43,7 @@ export default { ...@@ -43,7 +43,7 @@ export default {
<div v-if="hasSuites" class="test-reports-table gl-mb-3 js-test-cases-table"> <div v-if="hasSuites" class="test-reports-table gl-mb-3 js-test-cases-table">
<div role="row" class="gl-responsive-table-row table-row-header font-weight-bold fgray"> <div role="row" class="gl-responsive-table-row table-row-header font-weight-bold fgray">
<div role="rowheader" class="table-section section-20"> <div role="rowheader" class="table-section section-20">
{{ __('Class') }} {{ __('Suite') }}
</div> </div>
<div role="rowheader" class="table-section section-20"> <div role="rowheader" class="table-section section-20">
{{ __('Name') }} {{ __('Name') }}
...@@ -70,7 +70,7 @@ export default { ...@@ -70,7 +70,7 @@ export default {
class="gl-responsive-table-row rounded align-items-md-start mt-xs-3 js-case-row" class="gl-responsive-table-row rounded align-items-md-start mt-xs-3 js-case-row"
> >
<div class="table-section section-20 section-wrap"> <div class="table-section section-20 section-wrap">
<div role="rowheader" class="table-mobile-header">{{ __('Class') }}</div> <div role="rowheader" class="table-mobile-header">{{ __('Suite') }}</div>
<div <div
v-gl-tooltip v-gl-tooltip
:title="testCase.classname" :title="testCase.classname"
......
...@@ -85,7 +85,7 @@ export default { ...@@ -85,7 +85,7 @@ export default {
<div class="row mt-2"> <div class="row mt-2">
<div class="col-4 col-md"> <div class="col-4 col-md">
<span class="js-total-tests">{{ <span class="js-total-tests">{{
sprintf(s__('TestReports|%{count} jobs'), { count: report.total_count }) sprintf(s__('TestReports|%{count} tests'), { count: report.total_count })
}}</span> }}</span>
</div> </div>
......
...@@ -17,7 +17,7 @@ export default { ...@@ -17,7 +17,7 @@ export default {
heading: { heading: {
type: String, type: String,
required: false, required: false,
default: s__('TestReports|Test suites'), default: s__('TestReports|Jobs'),
}, },
}, },
computed: { computed: {
...@@ -47,7 +47,7 @@ export default { ...@@ -47,7 +47,7 @@ export default {
<div v-if="hasSuites" class="test-reports-table gl-mb-3 js-test-suites-table"> <div v-if="hasSuites" class="test-reports-table gl-mb-3 js-test-suites-table">
<div role="row" class="gl-responsive-table-row table-row-header font-weight-bold"> <div role="row" class="gl-responsive-table-row table-row-header font-weight-bold">
<div role="rowheader" class="table-section section-25 pl-3"> <div role="rowheader" class="table-section section-25 pl-3">
{{ __('Suite') }} {{ __('Job') }}
</div> </div>
<div role="rowheader" class="table-section section-25"> <div role="rowheader" class="table-section section-25">
{{ __('Duration') }} {{ __('Duration') }}
......
...@@ -4782,9 +4782,6 @@ msgstr "" ...@@ -4782,9 +4782,6 @@ msgstr ""
msgid "CiVariable|Validation failed" msgid "CiVariable|Validation failed"
msgstr "" msgstr ""
msgid "Class"
msgstr ""
msgid "Classification Label (optional)" msgid "Classification Label (optional)"
msgstr "" msgstr ""
...@@ -23179,13 +23176,13 @@ msgstr "" ...@@ -23179,13 +23176,13 @@ msgstr ""
msgid "TestReports|%{count} failures" msgid "TestReports|%{count} failures"
msgstr "" msgstr ""
msgid "TestReports|%{count} jobs" msgid "TestReports|%{count} tests"
msgstr "" msgstr ""
msgid "TestReports|%{rate}%{sign} success rate" msgid "TestReports|%{rate}%{sign} success rate"
msgstr "" msgstr ""
msgid "TestReports|Test suites" msgid "TestReports|Jobs"
msgstr "" msgstr ""
msgid "TestReports|Tests" msgid "TestReports|Tests"
......
...@@ -384,7 +384,7 @@ RSpec.describe 'Pipeline', :js do ...@@ -384,7 +384,7 @@ RSpec.describe 'Pipeline', :js do
find('.js-tests-tab-link').click find('.js-tests-tab-link').click
wait_for_requests wait_for_requests
expect(page).to have_content('Test suites') expect(page).to have_content('Jobs')
expect(page).to have_selector('.js-tests-detail', visible: :all) expect(page).to have_selector('.js-tests-detail', visible: :all)
end end
end end
...@@ -412,7 +412,7 @@ RSpec.describe 'Pipeline', :js do ...@@ -412,7 +412,7 @@ RSpec.describe 'Pipeline', :js do
it 'calls summary.json endpoint', :js do it 'calls summary.json endpoint', :js do
find('.js-tests-tab-link').click find('.js-tests-tab-link').click
expect(page).to have_content('Test suites') expect(page).to have_content('Jobs')
expect(page).to have_selector('.js-tests-detail', visible: :all) expect(page).to have_selector('.js-tests-detail', visible: :all)
end end
end end
......
...@@ -60,7 +60,7 @@ describe('Test reports summary', () => { ...@@ -60,7 +60,7 @@ describe('Test reports summary', () => {
}); });
it('displays the correct total', () => { it('displays the correct total', () => {
expect(totalTests().text()).toBe('4 jobs'); expect(totalTests().text()).toBe('4 tests');
}); });
it('displays the correct failure count', () => { it('displays the correct failure count', () => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment