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
f8cb92ac
Commit
f8cb92ac
authored
Nov 17, 2020
by
Desiree Chevalier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add merge trains checkbox selector and update tests
parent
78ad646b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
1 deletion
+11
-1
ee/app/views/projects/_merge_trains_settings.html.haml
ee/app/views/projects/_merge_trains_settings.html.haml
+1
-1
qa/qa/ee/page/project/settings/merge_request.rb
qa/qa/ee/page/project/settings/merge_request.rb
+9
-0
qa/qa/specs/features/ee/browser_ui/6_release/pipelines_for_merged_results_and_merge_trains_spec.rb
...ase/pipelines_for_merged_results_and_merge_trains_spec.rb
+1
-0
No files found.
ee/app/views/projects/_merge_trains_settings.html.haml
View file @
f8cb92ac
-
return
unless
merge_trains_available?
-
return
unless
merge_trains_available?
.form-check
.form-check
=
form
.
check_box
:merge_trains_enabled
,
class:
'form-check-input'
=
form
.
check_box
:merge_trains_enabled
,
class:
'form-check-input'
,
data:
{
qa_selector:
'merge_trains_checkbox'
}
=
form
.
label
:merge_trains_enabled
,
class:
'form-check-label'
do
=
form
.
label
:merge_trains_enabled
,
class:
'form-check-label'
do
=
s_
(
'ProjectSettings|Enable merge trains.'
)
=
s_
(
'ProjectSettings|Enable merge trains.'
)
.text-secondary.mb-2
.text-secondary.mb-2
...
...
qa/qa/ee/page/project/settings/merge_request.rb
View file @
f8cb92ac
...
@@ -17,6 +17,10 @@ module QA
...
@@ -17,6 +17,10 @@ module QA
view
'ee/app/views/projects/_merge_pipelines_settings.html.haml'
do
view
'ee/app/views/projects/_merge_pipelines_settings.html.haml'
do
element
:merged_results_pipeline_checkbox
element
:merged_results_pipeline_checkbox
end
end
view
'ee/app/views/projects/_merge_trains_settings.html.haml'
do
element
:merge_trains_checkbox
end
end
end
end
end
...
@@ -24,8 +28,13 @@ module QA
...
@@ -24,8 +28,13 @@ module QA
check_element
:merged_results_pipeline_checkbox
check_element
:merged_results_pipeline_checkbox
end
end
def
click_merge_trains_checkbox
check_element
:merge_trains_checkbox
end
def
enable_merge_train
def
enable_merge_train
click_pipelines_for_merged_results_checkbox
click_pipelines_for_merged_results_checkbox
click_merge_trains_checkbox
click_save_changes
click_save_changes
end
end
end
end
...
...
qa/qa/specs/features/ee/browser_ui/6_release/pipelines_for_merged_results_and_merge_trains_spec.rb
View file @
f8cb92ac
...
@@ -50,6 +50,7 @@ module QA
...
@@ -50,6 +50,7 @@ module QA
Page
::
Project
::
Settings
::
Main
.
perform
do
|
main
|
Page
::
Project
::
Settings
::
Main
.
perform
do
|
main
|
main
.
expand_merge_requests_settings
do
|
settings
|
main
.
expand_merge_requests_settings
do
|
settings
|
settings
.
click_pipelines_for_merged_results_checkbox
settings
.
click_pipelines_for_merged_results_checkbox
settings
.
click_merge_trains_checkbox
settings
.
click_save_changes
settings
.
click_save_changes
end
end
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