summaryrefslogtreecommitdiff
path: root/spec/features/projects/blobs/user_create_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/features/projects/blobs/user_create_spec.rb')
-rw-r--r--spec/features/projects/blobs/user_create_spec.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/spec/features/projects/blobs/user_create_spec.rb b/spec/features/projects/blobs/user_create_spec.rb
index 5686868a0c4..d805450e095 100644
--- a/spec/features/projects/blobs/user_create_spec.rb
+++ b/spec/features/projects/blobs/user_create_spec.rb
@@ -1,7 +1,6 @@
require 'spec_helper'
feature 'New blob creation', feature: true, js: true do
- include WaitForAjax
include TargetBranchHelpers
given(:user) { create(:user) }
@@ -22,7 +21,7 @@ feature 'New blob creation', feature: true, js: true do
end
def commit_file
- click_button 'Commit Changes'
+ click_button 'Commit changes'
end
context 'with default target branch' do
@@ -77,7 +76,7 @@ feature 'New blob creation', feature: true, js: true do
project,
user,
start_branch: 'master',
- target_branch: 'master',
+ branch_name: 'master',
commit_message: 'Create file',
file_path: 'feature.rb',
file_content: content
@@ -87,8 +86,8 @@ feature 'New blob creation', feature: true, js: true do
end
scenario 'shows error message' do
- expect(page).to have_content('Your changes could not be committed because a file with the same name already exists')
- expect(page).to have_content('New File')
+ expect(page).to have_content('A file with this name already exists')
+ expect(page).to have_content('New file')
expect(page).to have_content('NextFeature')
end
end