Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
879beccf
Commit
879beccf
authored
Jul 16, 2020
by
Scott Hampton
Committed by
Enrique Alcántara
Jul 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust test report text
Changed copy to be more accurate about what is being shown in the report.
parent
7ce7a8a3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
13 deletions
+10
-13
app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue
...ts/pipelines/components/test_reports/test_suite_table.vue
+2
-2
app/assets/javascripts/pipelines/components/test_reports/test_summary.vue
...cripts/pipelines/components/test_reports/test_summary.vue
+1
-1
app/assets/javascripts/pipelines/components/test_reports/test_summary_table.vue
.../pipelines/components/test_reports/test_summary_table.vue
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+2
-5
spec/features/projects/pipelines/pipeline_spec.rb
spec/features/projects/pipelines/pipeline_spec.rb
+2
-2
spec/frontend/pipelines/test_reports/test_summary_spec.js
spec/frontend/pipelines/test_reports/test_summary_spec.js
+1
-1
No files found.
app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue
View file @
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"
...
...
app/assets/javascripts/pipelines/components/test_reports/test_summary.vue
View file @
879beccf
...
@@ -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
}
job
s
'
),
{
count
:
report
.
total_count
}
)
sprintf
(
s__
(
'
TestReports|%{count
}
test
s
'
),
{
count
:
report
.
total_count
}
)
}}
<
/span
>
}}
<
/span
>
<
/div
>
<
/div
>
...
...
app/assets/javascripts/pipelines/components/test_reports/test_summary_table.vue
View file @
879beccf
...
@@ -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 suite
s
'
),
default
:
s__
(
'
TestReports|
Job
s
'
),
},
},
},
},
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
'
)
}}
...
...
locale/gitlab.pot
View file @
879beccf
...
@@ -4763,9 +4763,6 @@ msgstr ""
...
@@ -4763,9 +4763,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 ""
...
@@ -23076,13 +23073,13 @@ msgstr ""
...
@@ -23076,13 +23073,13 @@ msgstr ""
msgid "TestReports|%{count} failures"
msgid "TestReports|%{count} failures"
msgstr ""
msgstr ""
msgid "TestReports|%{count}
job
s"
msgid "TestReports|%{count}
test
s"
msgstr ""
msgstr ""
msgid "TestReports|%{rate}%{sign} success rate"
msgid "TestReports|%{rate}%{sign} success rate"
msgstr ""
msgstr ""
msgid "TestReports|
Test suite
s"
msgid "TestReports|
Job
s"
msgstr ""
msgstr ""
msgid "TestReports|Tests"
msgid "TestReports|Tests"
...
...
spec/features/projects/pipelines/pipeline_spec.rb
View file @
879beccf
...
@@ -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 suite
s'
)
expect
(
page
).
to
have_content
(
'
Job
s'
)
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 suite
s'
)
expect
(
page
).
to
have_content
(
'
Job
s'
)
expect
(
page
).
to
have_selector
(
'.js-tests-detail'
,
visible: :all
)
expect
(
page
).
to
have_selector
(
'.js-tests-detail'
,
visible: :all
)
end
end
end
end
...
...
spec/frontend/pipelines/test_reports/test_summary_spec.js
View file @
879beccf
...
@@ -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
job
s
'
);
expect
(
totalTests
().
text
()).
toBe
(
'
4
test
s
'
);
});
});
it
(
'
displays the correct failure count
'
,
()
=>
{
it
(
'
displays the correct failure count
'
,
()
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment