Commit 4d018fd0 authored by Walmyr Lima e Silva Filho's avatar Walmyr Lima e Silva Filho

Merge branch '43319-update-method-name' into 'master'

Update page object method name

Closes #43319

See merge request gitlab-org/gitlab!21701
parents 9102a16b 555668bf
...@@ -256,7 +256,7 @@ module QA ...@@ -256,7 +256,7 @@ module QA
approvals_content.match(/Requires (\d+) more approvals/)[1].to_i approvals_content.match(/Requires (\d+) more approvals/)[1].to_i
end end
def merge_merge_train_immediately def skip_merge_train_and_merge_immediately
click_element :merge_moment_dropdown click_element :merge_moment_dropdown
click_element :merge_immediately_option click_element :merge_immediately_option
......
...@@ -74,8 +74,8 @@ module QA ...@@ -74,8 +74,8 @@ module QA
expect(pipeline_passed).to be_truthy, "Expected the merged result pipeline to pass." expect(pipeline_passed).to be_truthy, "Expected the merged result pipeline to pass."
# The default option is to merge via merge train, # The default option is to merge via merge train,
# but that will be covered by another test # but that is covered by the 'merges via a merge train' test
show.merge_merge_train_immediately show.skip_merge_train_and_merge_immediately
end end
merged = Page::MergeRequest::Show.perform(&:merged?) merged = Page::MergeRequest::Show.perform(&:merged?)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment