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
This commit is contained in:
Dan Davison 2019-08-28 21:28:23 +00:00
commit 7225162f30
2 changed files with 10 additions and 2 deletions

View File

@ -69,7 +69,11 @@ export default {
:disabled="currentBranch && !currentBranch.can_push"
: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
:value="$options.commitToNewBranch"

View File

@ -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