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
6028d44a
Commit
6028d44a
authored
Jul 15, 2020
by
Nicolò Maria Mezzopera
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test-report-link-fix' into 'master'
Test report link fix See merge request gitlab-org/gitlab!36220
parents
0aad74c8
2310a80d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
3 deletions
+14
-3
app/assets/javascripts/reports/components/grouped_test_reports_app.vue
...vascripts/reports/components/grouped_test_reports_app.vue
+6
-1
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
...avascripts/vue_merge_request_widget/mr_widget_options.vue
+1
-1
changelogs/unreleased/test-report-link-fix.yml
changelogs/unreleased/test-report-link-fix.yml
+5
-0
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
...avascripts/vue_merge_request_widget/mr_widget_options.vue
+1
-1
spec/frontend/reports/components/grouped_test_reports_app_spec.js
...ntend/reports/components/grouped_test_reports_app_spec.js
+1
-0
No files found.
app/assets/javascripts/reports/components/grouped_test_reports_app.vue
View file @
6028d44a
...
...
@@ -114,7 +114,12 @@ export default {
class=
"mr-widget-section grouped-security-reports mr-report"
>
<template
v-if=
"showViewFullReport"
#actionButtons
>
<gl-button
:href=
"testTabURL"
icon=
"external-link"
data-testid=
"group-test-reports-full-link"
>
<gl-button
:href=
"testTabURL"
icon=
"external-link"
data-testid=
"group-test-reports-full-link"
class=
"gl-mr-3"
>
{{
s__
(
'
ciReport|View full report
'
)
}}
</gl-button>
</
template
>
...
...
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @
6028d44a
...
...
@@ -384,7 +384,7 @@ export default {
v-if=
"mr.testResultsPath"
class=
"js-reports-container"
:endpoint=
"mr.testResultsPath"
:pipeline-path=
"mr.
mergeRequestAddCiConfigP
ath"
:pipeline-path=
"mr.
pipeline.p
ath"
/>
<terraform-plan
v-if=
"mr.terraformReportsPath"
:endpoint=
"mr.terraformReportsPath"
/>
...
...
changelogs/unreleased/test-report-link-fix.yml
0 → 100644
View file @
6028d44a
---
title
:
Fix for test report link in MR widget
merge_request
:
author
:
type
:
fixed
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @
6028d44a
...
...
@@ -458,7 +458,7 @@ export default {
v-if=
"mr.testResultsPath"
class=
"js-reports-container"
:endpoint=
"mr.testResultsPath"
:pipeline-path=
"mr.
mergeRequestAddCiConfigP
ath"
:pipeline-path=
"mr.
pipeline.p
ath"
/>
<terraform-plan
v-if=
"mr.terraformReportsPath"
:endpoint=
"mr.terraformReportsPath"
/>
...
...
spec/frontend/reports/components/grouped_test_reports_app_spec.js
View file @
6028d44a
...
...
@@ -91,6 +91,7 @@ describe('Grouped test reports app', () => {
const
fullTestReportLink
=
findFullTestReportLink
();
expect
(
fullTestReportLink
.
exists
()).
toBe
(
true
);
expect
(
pipelinePath
).
not
.
toBe
(
''
);
expect
(
fullTestReportLink
.
attributes
(
'
href
'
)).
toBe
(
`
${
pipelinePath
}
/test_report`
);
});
});
...
...
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