2019-10-12 21:52:04 +05:30
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2017-09-10 17:25:29 +05:30
|
|
|
require 'spec_helper'
|
|
|
|
|
2019-12-26 22:10:19 +05:30
|
|
|
describe 'Projects > Files > User creates files', :js do
|
2017-09-10 17:25:29 +05:30
|
|
|
let(:fork_message) do
|
|
|
|
"You're not allowed to make changes to this project directly. "\
|
|
|
|
"A fork of this project has been created that you can make changes in, so you can submit a merge request."
|
|
|
|
end
|
|
|
|
let(:project) { create(:project, :repository, name: 'Shop') }
|
|
|
|
let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') }
|
|
|
|
let(:project_tree_path_root_ref) { project_tree_path(project, project.repository.root_ref) }
|
|
|
|
let(:project2_tree_path_root_ref) { project_tree_path(project2, project2.repository.root_ref) }
|
|
|
|
let(:user) { create(:user) }
|
|
|
|
|
|
|
|
before do
|
2019-07-07 11:18:12 +05:30
|
|
|
stub_feature_flags(web_ide_default: false)
|
|
|
|
|
2018-11-18 11:00:15 +05:30
|
|
|
project.add_maintainer(user)
|
2017-09-10 17:25:29 +05:30
|
|
|
sign_in(user)
|
|
|
|
end
|
|
|
|
|
2018-12-13 13:39:08 +05:30
|
|
|
context 'without committing a new file' do
|
2017-09-10 17:25:29 +05:30
|
|
|
context 'when an user has write access' do
|
|
|
|
before do
|
|
|
|
visit(project_tree_path_root_ref)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'opens new file page' do
|
|
|
|
find('.add-to-tree').click
|
|
|
|
click_link('New file')
|
|
|
|
|
|
|
|
expect(page).to have_content('New file')
|
|
|
|
expect(page).to have_content('Commit message')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'when an user does not have write access' do
|
|
|
|
before do
|
2018-03-17 18:26:18 +05:30
|
|
|
project2.add_reporter(user)
|
2017-09-10 17:25:29 +05:30
|
|
|
visit(project2_tree_path_root_ref)
|
|
|
|
end
|
|
|
|
|
2019-12-26 22:10:19 +05:30
|
|
|
it 'opens new file page on a forked project', :sidekiq_might_not_need_inline do
|
2017-09-10 17:25:29 +05:30
|
|
|
find('.add-to-tree').click
|
|
|
|
click_link('New file')
|
|
|
|
|
|
|
|
expect(page).to have_selector('.file-editor')
|
|
|
|
expect(page).to have_content(fork_message)
|
|
|
|
expect(page).to have_content('New file')
|
|
|
|
expect(page).to have_content('Commit message')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2018-12-13 13:39:08 +05:30
|
|
|
context 'with committing a new file' do
|
2017-09-10 17:25:29 +05:30
|
|
|
context 'when an user has write access' do
|
|
|
|
before do
|
|
|
|
visit(project_tree_path_root_ref)
|
|
|
|
|
|
|
|
find('.add-to-tree').click
|
|
|
|
click_link('New file')
|
|
|
|
expect(page).to have_selector('.file-editor')
|
|
|
|
end
|
|
|
|
|
2018-10-15 14:42:47 +05:30
|
|
|
def submit_new_file(options)
|
|
|
|
file_name = find('#file_name')
|
|
|
|
file_name.set options[:file_name] || 'README.md'
|
|
|
|
|
2019-12-26 22:10:19 +05:30
|
|
|
find('.ace_text-input', visible: false).send_keys.native.send_keys options[:file_content] || 'Some content'
|
2018-10-15 14:42:47 +05:30
|
|
|
|
|
|
|
click_button 'Commit changes'
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'allows Chinese characters in file name' do
|
|
|
|
submit_new_file(file_name: '测试.md')
|
|
|
|
expect(page).to have_content 'The file has been successfully created.'
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'allows Chinese characters in directory name' do
|
|
|
|
submit_new_file(file_name: '中文/测试.md')
|
|
|
|
expect(page).to have_content 'The file has been successfully created'
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not allow directory traversal in file name' do
|
|
|
|
submit_new_file(file_name: '../README.md')
|
|
|
|
expect(page).to have_content 'Path cannot include directory traversal'
|
|
|
|
end
|
|
|
|
|
2019-12-26 22:10:19 +05:30
|
|
|
it 'creates and commit a new file' do
|
2018-03-17 18:26:18 +05:30
|
|
|
find('#editor')
|
2017-09-10 17:25:29 +05:30
|
|
|
execute_script("ace.edit('editor').setValue('*.rbca')")
|
|
|
|
fill_in(:file_name, with: 'not_a_file.md')
|
|
|
|
fill_in(:commit_message, with: 'New commit message', visible: true)
|
|
|
|
click_button('Commit changes')
|
|
|
|
|
|
|
|
new_file_path = project_blob_path(project, 'master/not_a_file.md')
|
|
|
|
|
|
|
|
expect(current_path).to eq(new_file_path)
|
|
|
|
|
|
|
|
wait_for_requests
|
|
|
|
|
|
|
|
expect(page).to have_content('*.rbca')
|
|
|
|
end
|
|
|
|
|
2019-12-26 22:10:19 +05:30
|
|
|
it 'creates and commit a new file with new lines at the end of file' do
|
2018-03-17 18:26:18 +05:30
|
|
|
find('#editor')
|
2017-09-10 17:25:29 +05:30
|
|
|
execute_script('ace.edit("editor").setValue("Sample\n\n\n")')
|
|
|
|
fill_in(:file_name, with: 'not_a_file.md')
|
|
|
|
fill_in(:commit_message, with: 'New commit message', visible: true)
|
|
|
|
click_button('Commit changes')
|
|
|
|
|
|
|
|
new_file_path = project_blob_path(project, 'master/not_a_file.md')
|
|
|
|
|
|
|
|
expect(current_path).to eq(new_file_path)
|
|
|
|
|
|
|
|
find('.js-edit-blob').click
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
find('#editor')
|
2017-09-10 17:25:29 +05:30
|
|
|
expect(evaluate_script('ace.edit("editor").getValue()')).to eq("Sample\n\n\n")
|
|
|
|
end
|
|
|
|
|
2019-12-26 22:10:19 +05:30
|
|
|
it 'creates and commit a new file with a directory name' do
|
2017-09-10 17:25:29 +05:30
|
|
|
fill_in(:file_name, with: 'foo/bar/baz.txt')
|
|
|
|
|
|
|
|
expect(page).to have_selector('.file-editor')
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
find('#editor')
|
2017-09-10 17:25:29 +05:30
|
|
|
execute_script("ace.edit('editor').setValue('*.rbca')")
|
|
|
|
fill_in(:commit_message, with: 'New commit message', visible: true)
|
|
|
|
click_button('Commit changes')
|
|
|
|
|
|
|
|
expect(current_path).to eq(project_blob_path(project, 'master/foo/bar/baz.txt'))
|
|
|
|
|
|
|
|
wait_for_requests
|
|
|
|
|
|
|
|
expect(page).to have_content('*.rbca')
|
|
|
|
end
|
|
|
|
|
2019-12-26 22:10:19 +05:30
|
|
|
it 'creates and commit a new file specifying a new branch' do
|
2017-09-10 17:25:29 +05:30
|
|
|
expect(page).to have_selector('.file-editor')
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
find('#editor')
|
2017-09-10 17:25:29 +05:30
|
|
|
execute_script("ace.edit('editor').setValue('*.rbca')")
|
|
|
|
fill_in(:file_name, with: 'not_a_file.md')
|
|
|
|
fill_in(:commit_message, with: 'New commit message', visible: true)
|
|
|
|
fill_in(:branch_name, with: 'new_branch_name', visible: true)
|
|
|
|
click_button('Commit changes')
|
|
|
|
|
|
|
|
expect(current_path).to eq(project_new_merge_request_path(project))
|
|
|
|
|
|
|
|
click_link('Changes')
|
|
|
|
|
|
|
|
wait_for_requests
|
|
|
|
|
|
|
|
expect(page).to have_content('*.rbca')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2019-12-26 22:10:19 +05:30
|
|
|
context 'when an user does not have write access', :sidekiq_might_not_need_inline do
|
2017-09-10 17:25:29 +05:30
|
|
|
before do
|
2018-03-17 18:26:18 +05:30
|
|
|
project2.add_reporter(user)
|
2017-09-10 17:25:29 +05:30
|
|
|
visit(project2_tree_path_root_ref)
|
|
|
|
|
|
|
|
find('.add-to-tree').click
|
|
|
|
click_link('New file')
|
2018-03-27 19:54:05 +05:30
|
|
|
end
|
|
|
|
|
|
|
|
it 'shows a message saying the file will be committed in a fork' do
|
|
|
|
message = "A new branch will be created in your fork and a new merge request will be started."
|
2017-09-10 17:25:29 +05:30
|
|
|
|
2018-03-27 19:54:05 +05:30
|
|
|
expect(page).to have_content(message)
|
|
|
|
end
|
|
|
|
|
2019-12-26 22:10:19 +05:30
|
|
|
it 'creates and commit new file in forked project' do
|
2017-09-10 17:25:29 +05:30
|
|
|
expect(page).to have_selector('.file-editor')
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
find('#editor')
|
2017-09-10 17:25:29 +05:30
|
|
|
execute_script("ace.edit('editor').setValue('*.rbca')")
|
|
|
|
|
|
|
|
fill_in(:file_name, with: 'not_a_file.md')
|
|
|
|
fill_in(:commit_message, with: 'New commit message', visible: true)
|
|
|
|
click_button('Commit changes')
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
fork = user.fork_of(project2.reload)
|
2017-09-10 17:25:29 +05:30
|
|
|
|
|
|
|
expect(current_path).to eq(project_new_merge_request_path(fork))
|
|
|
|
expect(page).to have_content('New commit message')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|