diff options
Diffstat (limited to 'spec/features/projects/files/user_edits_files_spec.rb')
| -rw-r--r-- | spec/features/projects/files/user_edits_files_spec.rb | 173 |
1 files changed, 148 insertions, 25 deletions
diff --git a/spec/features/projects/files/user_edits_files_spec.rb b/spec/features/projects/files/user_edits_files_spec.rb index d3e075001c8..c18ff9ddbbc 100644 --- a/spec/features/projects/files/user_edits_files_spec.rb +++ b/spec/features/projects/files/user_edits_files_spec.rb @@ -4,6 +4,8 @@ require 'spec_helper' RSpec.describe 'Projects > Files > User edits files', :js do include ProjectForksHelper + include BlobSpecHelpers + 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) } @@ -14,6 +16,10 @@ RSpec.describe 'Projects > Files > User edits files', :js do sign_in(user) end + after do + unset_default_button + end + shared_examples 'unavailable for an archived project' do it 'does not show the edit link for an archived project', :js do project.update!(archived: true) @@ -39,14 +45,15 @@ RSpec.describe 'Projects > Files > User edits files', :js do end it 'inserts a content of a file' do + set_default_button('edit') click_link('.gitignore') - find('.js-edit-blob').click + click_link_or_button('Edit') find('.file-editor', match: :first) find('#editor') - execute_script("monaco.editor.getModels()[0].setValue('*.rbca')") + set_editor_value('*.rbca') - expect(evaluate_script('monaco.editor.getModels()[0].getValue()')).to eq('*.rbca') + expect(editor_value).to eq('*.rbca') end it 'does not show the edit link if a file is binary' do @@ -60,12 +67,13 @@ RSpec.describe 'Projects > Files > User edits files', :js do end it 'commits an edited file' do + set_default_button('edit') click_link('.gitignore') - find('.js-edit-blob').click + click_link_or_button('Edit') find('.file-editor', match: :first) find('#editor') - execute_script("monaco.editor.getModels()[0].setValue('*.rbca')") + set_editor_value('*.rbca') fill_in(:commit_message, with: 'New commit message', visible: true) click_button('Commit changes') @@ -77,13 +85,14 @@ RSpec.describe 'Projects > Files > User edits files', :js do end it 'commits an edited file to a new branch' do + set_default_button('edit') click_link('.gitignore') - find('.js-edit-blob').click + click_link_or_button('Edit') find('.file-editor', match: :first) find('#editor') - execute_script("monaco.editor.getModels()[0].setValue('*.rbca')") + set_editor_value('*.rbca') fill_in(:commit_message, with: 'New commit message', visible: true) fill_in(:branch_name, with: 'new_branch_name', visible: true) click_button('Commit changes') @@ -96,12 +105,13 @@ RSpec.describe 'Projects > Files > User edits files', :js do end it 'shows the diff of an edited file' do + set_default_button('edit') click_link('.gitignore') - find('.js-edit-blob').click + click_link_or_button('Edit') find('.file-editor', match: :first) find('#editor') - execute_script("monaco.editor.getModels()[0].setValue('*.rbca')") + set_editor_value('*.rbca') click_link('Preview changes') expect(page).to have_css('.line_holder.new') @@ -118,8 +128,8 @@ RSpec.describe 'Projects > Files > User edits files', :js do end def expect_fork_prompt - expect(page).to have_link('Fork') - expect(page).to have_button('Cancel') + expect(page).to have_selector(:link_or_button, 'Fork') + expect(page).to have_selector(:link_or_button, 'Cancel') expect(page).to have_content( "You're not allowed to edit files in this project directly. "\ "Please fork this project, make your changes there, and submit a merge request." @@ -134,30 +144,32 @@ RSpec.describe 'Projects > Files > User edits files', :js do end it 'inserts a content of a file in a forked project', :sidekiq_might_not_need_inline do + set_default_button('edit') click_link('.gitignore') - click_button('Edit') + click_link_or_button('Edit') expect_fork_prompt - click_link('Fork') + click_link_or_button('Fork project') expect_fork_status find('.file-editor', match: :first) find('#editor') - execute_script("monaco.editor.getModels()[0].setValue('*.rbca')") + set_editor_value('*.rbca') - expect(evaluate_script('monaco.editor.getModels()[0].getValue()')).to eq('*.rbca') + expect(editor_value).to eq('*.rbca') end it 'opens the Web IDE in a forked project', :sidekiq_might_not_need_inline do + set_default_button('webide') click_link('.gitignore') - click_button('Web IDE') + click_link_or_button('Web IDE') expect_fork_prompt - click_link('Fork') + click_link_or_button('Fork project') expect_fork_status @@ -166,17 +178,17 @@ RSpec.describe 'Projects > Files > User edits files', :js do end it 'commits an edited file in a forked project', :sidekiq_might_not_need_inline do + set_default_button('edit') click_link('.gitignore') - find('.js-edit-blob').click + click_link_or_button('Edit') expect_fork_prompt - - click_link('Fork') + click_link_or_button('Fork project') find('.file-editor', match: :first) find('#editor') - execute_script("monaco.editor.getModels()[0].setValue('*.rbca')") + set_editor_value('*.rbca') fill_in(:commit_message, with: 'New commit message', visible: true) click_button('Commit changes') @@ -198,14 +210,14 @@ RSpec.describe 'Projects > Files > User edits files', :js do end it 'links to the forked project for editing', :sidekiq_might_not_need_inline do + set_default_button('edit') click_link('.gitignore') - find('.js-edit-blob').click + click_link_or_button('Edit') - expect(page).not_to have_link('Fork') - expect(page).not_to have_button('Cancel') + expect(page).not_to have_link('Fork project') find('#editor') - execute_script("monaco.editor.getModels()[0].setValue('*.rbca')") + set_editor_value('*.rbca') fill_in(:commit_message, with: 'Another commit', visible: true) click_button('Commit changes') @@ -224,5 +236,116 @@ RSpec.describe 'Projects > Files > User edits files', :js do let(:project) { project2 } end end + + context 'when feature flag :consolidated_edit_button is off' do + before do + stub_feature_flags(consolidated_edit_button: false) + end + + context 'when an user does not have write access', :js do + before do + project2.add_reporter(user) + visit(project2_tree_path_root_ref) + wait_for_requests + end + + it 'inserts a content of a file in a forked project', :sidekiq_might_not_need_inline do + set_default_button('edit') + click_link('.gitignore') + click_link_or_button('Edit') + + expect_fork_prompt + + click_link_or_button('Fork') + + expect_fork_status + + find('.file-editor', match: :first) + + find('#editor') + set_editor_value('*.rbca') + + expect(editor_value).to eq('*.rbca') + end + + it 'opens the Web IDE in a forked project', :sidekiq_might_not_need_inline do + set_default_button('webide') + click_link('.gitignore') + click_link_or_button('Web IDE') + + expect_fork_prompt + + click_link_or_button('Fork') + + expect_fork_status + + expect(page).to have_css('.ide-sidebar-project-title', text: "#{project2.name} #{user.namespace.full_path}/#{project2.path}") + expect(page).to have_css('.ide .multi-file-tab', text: '.gitignore') + end + + it 'commits an edited file in a forked project', :sidekiq_might_not_need_inline do + set_default_button('edit') + click_link('.gitignore') + click_link_or_button('Edit') + + expect_fork_prompt + + click_link_or_button('Fork') + + expect_fork_status + + find('.file-editor', match: :first) + + find('#editor') + set_editor_value('*.rbca') + fill_in(:commit_message, with: 'New commit message', visible: true) + click_button('Commit changes') + + fork = user.fork_of(project2.reload) + + expect(current_path).to eq(project_new_merge_request_path(fork)) + + wait_for_requests + + expect(page).to have_content('New commit message') + end + + context 'when the user already had a fork of the project', :js do + let!(:forked_project) { fork_project(project2, user, namespace: user.namespace, repository: true) } + + before do + visit(project2_tree_path_root_ref) + wait_for_requests + end + + it 'links to the forked project for editing', :sidekiq_might_not_need_inline do + set_default_button('edit') + click_link('.gitignore') + click_link_or_button('Edit') + + expect(page).not_to have_link('Fork') + + find('#editor') + set_editor_value('*.rbca') + fill_in(:commit_message, with: 'Another commit', visible: true) + click_button('Commit changes') + + fork = user.fork_of(project2) + + expect(current_path).to eq(project_new_merge_request_path(fork)) + + wait_for_requests + + expect(page).to have_content('Another commit') + expect(page).to have_content("From #{forked_project.full_path}") + expect(page).to have_content("into #{project2.full_path}") + end + + it_behaves_like 'unavailable for an archived project' do + let(:project) { project2 } + end + end + end + end end end |