summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorDenys Mishunov <dmishunov@gitlab.com>2019-08-22 23:23:06 +0000
committerPaul Slaughter <pslaughter@gitlab.com>2019-08-22 23:23:06 +0000
commit371e1ed3716d25f48c6458373e64ea81e0a45946 (patch)
treeb270a0bc9ea40ef7666ef2ae1da3770e2a30ca02 /qa
parent16edda3e4db941a8d7122bf1b4fcc854d2aa0927 (diff)
downloadgitlab-ce-371e1ed3716d25f48c6458373e64ea81e0a45946.tar.gz
Always pre-select "Start a new merge request"
One exception: there is an existing MR for the current branch and the branch is non-default and non-protected. Extended mock_data for ide/stores to have different types of branches: default, protected and regular Cleaned new MR checkbox view
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/page/project/web_ide/edit.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/qa/qa/page/project/web_ide/edit.rb b/qa/qa/page/project/web_ide/edit.rb
index b5a36862389..37bca97fec7 100644
--- a/qa/qa/page/project/web_ide/edit.rb
+++ b/qa/qa/page/project/web_ide/edit.rb
@@ -39,6 +39,10 @@ module QA
element :commit_button
end
+ view 'app/assets/javascripts/ide/components/commit_sidebar/new_merge_request_option.vue' do
+ element :start_new_mr_checkbox
+ end
+
def has_file?(file_name)
within_element(:file_list) do
page.has_content? file_name
@@ -100,6 +104,7 @@ module QA
# animation is still in process even when the buttons have the
# expected visibility.
commit_success_msg_shown = retry_until do
+ uncheck_element :start_new_mr_checkbox
click_element :commit_button
wait(reload: false) do