update to current master and fix conflictsissue-title-vue

1 files changed, 3 insertions, 15 deletions

diff --git a/spec/features/projects/blobs/user_create_spec.rb b/spec/features/projects/blobs/user_create_spec.rb
index 03d08c12612..5686868a0c4 100644
--- a/spec/features/projects/blobs/user_create_spec.rb
+++ b/spec/features/projects/blobs/user_create_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 feature 'New blob creation', feature: true, js: true do
   include WaitForAjax
+  include TargetBranchHelpers
 
   given(:user) { create(:user) }
   given(:role) { :developer }
@@ -20,19 +21,6 @@ feature 'New blob creation', feature: true, js: true do
     execute_script("ace.edit('editor').setValue('#{content}')")
   end
 
-  def select_branch_index(index)
-    first('button.js-target-branch').click
-    wait_for_ajax
-    all('a[data-group="Branches"]')[index].click
-  end
-
-  def create_new_branch(name)
-    first('button.js-target-branch').click
-    click_link 'Create new branch'
-    fill_in 'new_branch_name', with: name
-    click_button 'Create'
-  end
-
   def commit_file
     click_button 'Commit Changes'
   end
@@ -53,12 +41,12 @@ feature 'New blob creation', feature: true, js: true do
   context 'with different target branch' do
     background do
       edit_file
-      select_branch_index(0)
+      select_branch('feature')
       commit_file
     end
 
     scenario 'creates the blob in the different branch' do
-      expect(page).to have_content 'test'
+      expect(page).to have_content 'feature'
       expect(page).to have_content 'successfully created'
     end
   end