Commit to current branch by default

When using the Web IDE

Commit to current branch by default
e3569c70 · Mark Lapierre · 6308c0ab · e3569c70 · e3569c70
Commit e3569c70 authored 5 years ago by Mark Lapierre
--- a/app/assets/javascripts/ide/components/commit_sidebar/actions.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/actions.vue
@@ -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"

--- a/qa/qa/page/project/web_ide/edit.rb
+++ b/qa/qa/page/project/web_ide/edit.rb
@@ -34,6 +34,10 @@ class Edit < Page::Base
            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 @@ def commit_changes
            # 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