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
555668bf
Commit
555668bf
authored
Dec 13, 2019
by
Mark Lapierre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update page object method name
The new name should be clearer and less awkward
parent
459285fb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
qa/qa/ee/page/merge_request/show.rb
qa/qa/ee/page/merge_request/show.rb
+1
-1
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
+2
-2
No files found.
qa/qa/ee/page/merge_request/show.rb
View file @
555668bf
...
...
@@ -256,7 +256,7 @@ module QA
approvals_content
.
match
(
/Requires (\d+) more approvals/
)[
1
].
to_i
end
def
merge_merge_train
_immediately
def
skip_merge_train_and_merge
_immediately
click_element
:merge_moment_dropdown
click_element
:merge_immediately_option
...
...
qa/qa/specs/features/ee/browser_ui/6_release/pipelines_for_merged_results_and_merge_trains_spec.rb
View file @
555668bf
...
...
@@ -74,8 +74,8 @@ module QA
expect
(
pipeline_passed
).
to
be_truthy
,
"Expected the merged result pipeline to pass."
# The default option is to merge via merge train,
# but that
will be covered by another
test
show
.
merge_merge_train
_immediately
# but that
is covered by the 'merges via a merge train'
test
show
.
skip_merge_train_and_merge
_immediately
end
merged
=
Page
::
MergeRequest
::
Show
.
perform
(
&
:merged?
)
...
...
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