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
3f25f30f
Commit
3f25f30f
authored
Oct 12, 2021
by
pburdette
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply maintainer feedback
parent
c28b6bbd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
7 deletions
+17
-7
ee/app/assets/javascripts/vue_merge_request_widget/components/merge_train_helper_icon.vue
...rge_request_widget/components/merge_train_helper_icon.vue
+11
-6
ee/spec/features/merge_trains/user_adds_to_merge_train_when_pipeline_succeeds_spec.rb
...s/user_adds_to_merge_train_when_pipeline_succeeds_spec.rb
+6
-1
No files found.
ee/app/assets/javascripts/vue_merge_request_widget/components/merge_train_helper_icon.vue
View file @
3f25f30f
...
...
@@ -24,31 +24,36 @@ export default {
moreInfo
:
s__
(
'
mrWidget|More information
'
),
learnMore
:
s__
(
'
mrWidget|Learn more
'
),
},
popoverConstants
:
{
target
:
'
merge-train-help
'
,
container
:
'
merge-train-help-container
'
,
},
};
</
script
>
<
template
>
<div
id=
"merge-train-help-container"
data-testid=
"merge-train-helper-icon
"
>
<div
:id=
"$options.popoverConstants.container
"
>
<gl-icon
id=
"merge-train-help
"
:id=
"$options.popoverConstants.target
"
name=
"question-o"
class=
"gl-text-blue-600"
:aria-label=
"$options.i18n.moreInfo"
data-testid=
"merge-train-helper-icon"
/>
<gl-popover
target=
"merge-train-help
"
container=
"merge-train-help-
container"
:target=
"$options.popoverConstants.target
"
:container=
"$options.popoverConstants.
container"
placement=
"top"
:title=
"$options.i18n.popoverTitle"
triggers=
"hover focus"
>
<p>
{{
$options
.
i18n
.
popoverContent
}}
</p>
<p
data-testid=
"merge-train-helper-content"
>
{{
$options
.
i18n
.
popoverContent
}}
</p>
<gl-link
class=
"gl-mt-3"
:href=
"mergeTrainWhenPipelineSucceedsDocsPath"
target=
"_blank"
rel=
"noopener noreferrer"
data-testid=
"
documentation
-link"
data-testid=
"
merge-train-helper
-link"
>
{{
$options
.
i18n
.
learnMore
}}
</gl-link>
...
...
ee/spec/features/merge_trains/user_adds_to_merge_train_when_pipeline_succeeds_spec.rb
View file @
3f25f30f
...
...
@@ -29,7 +29,11 @@ RSpec.describe 'User adds to merge train when pipeline succeeds', :js do
visit
project_merge_request_path
(
project
,
merge_request
)
expect
(
page
).
to
have_button
(
'Start merge train when pipeline succeeds'
)
expect
(
page
).
to
have_selector
(
'[data-testid="merge-train-helper-icon"]'
)
find
(
'[data-testid="merge-train-helper-icon"]'
).
hover
expect
(
page
).
to
have_selector
(
'[data-testid="merge-train-helper-content"]'
)
expect
(
page
).
to
have_link
(
'Learn more'
,
href:
help_page_path
(
'ci/pipelines/merge_trains.md'
,
anchor:
'add-a-merge-request-to-a-merge-train'
))
end
context
'when merge_trains EEP license is not available'
do
...
...
@@ -41,6 +45,7 @@ RSpec.describe 'User adds to merge train when pipeline succeeds', :js do
visit
project_merge_request_path
(
project
,
merge_request
)
expect
(
page
).
not_to
have_button
(
'Start merge train when pipeline succeeds'
)
expect
(
page
).
not_to
have_selector
(
'[data-testid="merge-train-helper-icon"]'
)
end
end
...
...
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