diff options
author | Robert Speicher <rspeicher@gmail.com> | 2017-07-06 19:43:51 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2017-07-06 19:43:51 +0300 |
commit | eef068754af7437baf327c5cb4e2b454ba40a617 (patch) | |
tree | 3583327140b2994432de317b4ac06d66b274b430 /spec/features/projects/files | |
parent | 9eeba8fb49c5da7cf0b2c22bc33cbd33a83918ed (diff) | |
parent | 9274c3c1598f3ff32339e681d5812feeb0f62605 (diff) |
Merge branch 'master' into rs-sign_in
Diffstat (limited to 'spec/features/projects/files')
-rw-r--r-- | spec/features/projects/files/creating_a_file_spec.rb | 5 | ||||
-rw-r--r-- | spec/features/projects/files/editing_a_file_spec.rb | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/spec/features/projects/files/creating_a_file_spec.rb b/spec/features/projects/files/creating_a_file_spec.rb index 1367077c4cf..55350db4c34 100644 --- a/spec/features/projects/files/creating_a_file_spec.rb +++ b/spec/features/projects/files/creating_a_file_spec.rb @@ -30,11 +30,6 @@ feature 'User wants to create a file', feature: true do expect(page).to have_content 'The file has been successfully created' end - scenario 'file name contains invalid characters' do - submit_new_file(file_name: '\\') - expect(page).to have_content 'Path can contain only' - end - scenario 'file name contains directory traversal' do submit_new_file(file_name: '../README.md') expect(page).to have_content 'Path cannot include directory traversal' diff --git a/spec/features/projects/files/editing_a_file_spec.rb b/spec/features/projects/files/editing_a_file_spec.rb index f93647b2d7e..c295380dfc9 100644 --- a/spec/features/projects/files/editing_a_file_spec.rb +++ b/spec/features/projects/files/editing_a_file_spec.rb @@ -18,7 +18,8 @@ feature 'User wants to edit a file', feature: true do background do project.team << [user, :master] sign_in user - visit project_edit_blob_path(project, File.join(project.default_branch, '.gitignore')) + visit project_edit_blob_path(project, + File.join(project.default_branch, '.gitignore')) end scenario 'file has been updated since the user opened the edit page' do |