diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-25 07:58:23 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-02-25 07:58:23 +0000 |
commit | 7eaafea288cc43f7e314e44c6e46c87661cfd21d (patch) | |
tree | 7967db780f68158b160ea45322cd76bf76eb4354 /qa/qa/page/merge_request/show.rb | |
parent | b9ed721bc23ef2debe321393c2bc161a60912e5e (diff) | |
parent | ace3bf9adad6d5752bfebafb6606bfa57b3818e4 (diff) | |
download | gitlab-ce-7eaafea288cc43f7e314e44c6e46c87661cfd21d.tar.gz |
Merge branch 'backport-qa_78' into 'master'
QA BACKPORT - Test merge request rebase
See merge request gitlab-org/gitlab-ce!17186
Diffstat (limited to 'qa/qa/page/merge_request/show.rb')
-rw-r--r-- | qa/qa/page/merge_request/show.rb | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb new file mode 100644 index 00000000000..35875487da8 --- /dev/null +++ b/qa/qa/page/merge_request/show.rb @@ -0,0 +1,46 @@ +module QA + module Page + module MergeRequest + class Show < Page::Base + view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js' do + element :merge_button + end + + view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue' do + element :merged_status, 'The changes were merged into' + end + + view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue' do + element :mr_rebase_button + element :fast_forward_nessage, "Fast-forward merge is not possible" + end + + def rebase! + wait(reload: false) do + click_element :mr_rebase_button + + has_text?("The source branch HEAD has recently changed.") + end + end + + def fast_forward_possible? + !has_text?("Fast-forward merge is not possible") + end + + def has_merge_button? + refresh + + has_selector?('.accept-merge-request') + end + + def merge! + wait(reload: false) do + click_element :merge_button + + has_text?("The changes were merged into") + end + end + end + end + end +end |