diff options
| author | Dan Davison <ddavison@gitlab.com> | 2019-08-29 00:28:23 +0300 |
|---|---|---|
| committer | Dan Davison <ddavison@gitlab.com> | 2019-08-29 00:28:23 +0300 |
| commit | 7225162f30d0cbdefddba802f84e19d55d46da94 (patch) | |
| tree | c50cc9a93d13ef60fcccb8db1ff120498690f1ad /qa | |
| parent | ce8f60cbc2c47557373eb0d71c9c88eab5a3b143 (diff) | |
| parent | e3569c70b9f65b6267a565f521daec5c2f8ee987 (diff) | |
Merge branch 'qa-ml-web-ide-commit-to-current-branch' into 'master'
Commit to current branch by default in Web IDE E2E tests
See merge request gitlab-org/gitlab-ce!32248
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/page/project/web_ide/edit.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/qa/qa/page/project/web_ide/edit.rb b/qa/qa/page/project/web_ide/edit.rb index 37bca97fec7..7541baed467 100644 --- a/qa/qa/page/project/web_ide/edit.rb +++ b/qa/qa/page/project/web_ide/edit.rb @@ -34,6 +34,10 @@ module QA element :dropdown_filter_input end + view 'app/assets/javascripts/ide/components/commit_sidebar/actions.vue' do + element :commit_to_current_branch_radio + end + view 'app/assets/javascripts/ide/components/commit_sidebar/form.vue' do element :begin_commit_button element :commit_button @@ -104,7 +108,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_to_current_branch_radio click_element :commit_button wait(reload: false) do |