Commit 7225162f authored by Dan Davison's avatar Dan Davison

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
parents ce8f60cb e3569c70
...@@ -69,7 +69,11 @@ export default { ...@@ -69,7 +69,11 @@ export default {
:disabled="currentBranch && !currentBranch.can_push" :disabled="currentBranch && !currentBranch.can_push"
:title="$options.currentBranchPermissionsTooltip" :title="$options.currentBranchPermissionsTooltip"
> >
<span class="ide-radio-label" v-html="commitToCurrentBranchText"> </span> <span
class="ide-radio-label"
data-qa-selector="commit_to_current_branch_radio"
v-html="commitToCurrentBranchText"
></span>
</radio-group> </radio-group>
<radio-group <radio-group
:value="$options.commitToNewBranch" :value="$options.commitToNewBranch"
......
...@@ -34,6 +34,10 @@ module QA ...@@ -34,6 +34,10 @@ module QA
element :dropdown_filter_input element :dropdown_filter_input
end 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 view 'app/assets/javascripts/ide/components/commit_sidebar/form.vue' do
element :begin_commit_button element :begin_commit_button
element :commit_button element :commit_button
...@@ -104,7 +108,7 @@ module QA ...@@ -104,7 +108,7 @@ module QA
# animation is still in process even when the buttons have the # animation is still in process even when the buttons have the
# expected visibility. # expected visibility.
commit_success_msg_shown = retry_until do commit_success_msg_shown = retry_until do
uncheck_element :start_new_mr_checkbox click_element :commit_to_current_branch_radio
click_element :commit_button click_element :commit_button
wait(reload: false) do wait(reload: false) do
......
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