diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-24 09:06:55 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-24 09:06:55 +0000 |
commit | cc17067085cc61c99322eb5934b73bc30b3e1caf (patch) | |
tree | f9733b96dd8a969e4b929fbf18658fb02614f987 /spec/features | |
parent | 4aaf4774a7af3614ac67149bcdef6c9b5ae5c2cd (diff) | |
parent | c147bccc45dc1a47b17a18d14169606470833d02 (diff) | |
download | gitlab-ce-cc17067085cc61c99322eb5934b73bc30b3e1caf.tar.gz |
Merge branch 'ph-multi-file-editor-new-file-folder-dropdown' into 'master'
Add new files & directories in the multi-file editor
Closes #38614
See merge request gitlab-org/gitlab-ce!14839
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/projects/tree/create_directory_spec.rb | 43 | ||||
-rw-r--r-- | spec/features/projects/tree/create_file_spec.rb | 40 |
2 files changed, 83 insertions, 0 deletions
diff --git a/spec/features/projects/tree/create_directory_spec.rb b/spec/features/projects/tree/create_directory_spec.rb new file mode 100644 index 00000000000..4c1fa5a666e --- /dev/null +++ b/spec/features/projects/tree/create_directory_spec.rb @@ -0,0 +1,43 @@ +require 'spec_helper' + +feature 'Multi-file editor new directory', :js do + include WaitForRequests + + let(:user) { create(:user) } + let(:project) { create(:project, :repository) } + + before do + project.add_master(user) + sign_in(user) + + page.driver.set_cookie('new_repo', 'true') + + visit project_tree_path(project, :master) + + wait_for_requests + end + + it 'creates directory in current directory' do + find('.add-to-tree').click + + click_link('New directory') + + page.within('.popup-dialog') do + find('.form-control').set('foldername') + + click_button('Create directory') + end + + fill_in('commit-message', with: 'commit message') + + click_button('Commit 1 file') + + expect(page).to have_content('Your changes have been committed') + expect(page).to have_selector('td', text: 'commit message') + + click_link('foldername') + + expect(page).to have_selector('td', text: 'commit message', count: 2) + expect(page).to have_selector('td', text: '.gitkeep') + end +end diff --git a/spec/features/projects/tree/create_file_spec.rb b/spec/features/projects/tree/create_file_spec.rb new file mode 100644 index 00000000000..a67ec891e7c --- /dev/null +++ b/spec/features/projects/tree/create_file_spec.rb @@ -0,0 +1,40 @@ +require 'spec_helper' + +feature 'Multi-file editor new file', :js do + include WaitForRequests + + let(:user) { create(:user) } + let(:project) { create(:project, :repository) } + + before do + project.add_master(user) + sign_in(user) + + page.driver.set_cookie('new_repo', 'true') + + visit project_tree_path(project, :master) + + wait_for_requests + end + + it 'creates file in current directory' do + find('.add-to-tree').click + + click_link('New file') + + page.within('.popup-dialog') do + find('.form-control').set('filename') + + click_button('Create file') + end + + find('.inputarea').send_keys('file content') + + fill_in('commit-message', with: 'commit message') + + click_button('Commit 1 file') + + expect(page).to have_content('Your changes have been committed') + expect(page).to have_selector('td', text: 'commit message') + end +end |