2017-07-12 08:45:42 -04:00
|
|
|
require 'spec_helper'
|
|
|
|
|
|
|
|
describe 'User creates files' do
|
|
|
|
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
|
2017-07-24 18:51:14 -04:00
|
|
|
let(:project) { create(:project, :repository, name: 'Shop') }
|
2017-07-12 08:45:42 -04:00
|
|
|
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
|
|
|
|
project.team << [user, :master]
|
|
|
|
sign_in(user)
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'without commiting a new file' do
|
|
|
|
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
|
|
|
|
project2.team << [user, :reporter]
|
|
|
|
visit(project2_tree_path_root_ref)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'opens new file page on a forked project' do
|
|
|
|
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
|
|
|
|
|
|
|
|
context 'with commiting a new file' do
|
|
|
|
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')
|
2017-08-26 15:51:47 -04:00
|
|
|
expect(page).to have_selector('.file-editor')
|
2017-07-12 08:45:42 -04:00
|
|
|
end
|
|
|
|
|
2017-10-03 04:35:01 -04:00
|
|
|
it 'creates and commit a new file', :js do
|
2017-10-16 13:37:52 -04:00
|
|
|
find('#editor')
|
2017-07-12 08:45:42 -04:00
|
|
|
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
|
|
|
|
|
2017-10-03 04:35:01 -04:00
|
|
|
it 'creates and commit a new file with new lines at the end of file', :js do
|
2017-10-16 13:37:52 -04:00
|
|
|
find('#editor')
|
2017-07-12 08:45:42 -04:00
|
|
|
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
|
|
|
|
|
2017-10-16 13:37:52 -04:00
|
|
|
find('#editor')
|
2017-07-12 08:45:42 -04:00
|
|
|
expect(evaluate_script('ace.edit("editor").getValue()')).to eq("Sample\n\n\n")
|
|
|
|
end
|
|
|
|
|
2017-10-03 04:35:01 -04:00
|
|
|
it 'creates and commit a new file with a directory name', :js do
|
2017-07-12 08:45:42 -04:00
|
|
|
fill_in(:file_name, with: 'foo/bar/baz.txt')
|
|
|
|
|
|
|
|
expect(page).to have_selector('.file-editor')
|
|
|
|
|
2017-10-16 13:37:52 -04:00
|
|
|
find('#editor')
|
2017-07-12 08:45:42 -04:00
|
|
|
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
|
|
|
|
|
2017-10-03 04:35:01 -04:00
|
|
|
it 'creates and commit a new file specifying a new branch', :js do
|
2017-07-12 08:45:42 -04:00
|
|
|
expect(page).to have_selector('.file-editor')
|
|
|
|
|
2017-10-16 13:37:52 -04:00
|
|
|
find('#editor')
|
2017-07-12 08:45:42 -04:00
|
|
|
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
|
|
|
|
|
|
|
|
context 'when an user does not have write access' do
|
|
|
|
before do
|
|
|
|
project2.team << [user, :reporter]
|
|
|
|
visit(project2_tree_path_root_ref)
|
|
|
|
end
|
|
|
|
|
2017-10-03 04:35:01 -04:00
|
|
|
it 'creates and commit new file in forked project', :js do
|
2017-07-12 08:45:42 -04:00
|
|
|
find('.add-to-tree').click
|
|
|
|
click_link('New file')
|
|
|
|
|
|
|
|
expect(page).to have_selector('.file-editor')
|
|
|
|
|
2017-10-16 13:37:52 -04:00
|
|
|
find('#editor')
|
2017-07-12 08:45:42 -04:00
|
|
|
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')
|
|
|
|
|
2017-09-29 04:04:50 -04:00
|
|
|
fork = user.fork_of(project2.reload)
|
2017-07-12 08:45:42 -04:00
|
|
|
|
|
|
|
expect(current_path).to eq(project_new_merge_request_path(fork))
|
|
|
|
expect(page).to have_content('New commit message')
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|