diff options
Diffstat (limited to 'spec/features/projects/commit/user_reverts_commit_spec.rb')
-rw-r--r-- | spec/features/projects/commit/user_reverts_commit_spec.rb | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/spec/features/projects/commit/user_reverts_commit_spec.rb b/spec/features/projects/commit/user_reverts_commit_spec.rb index ca4e070703b..f3c364dab97 100644 --- a/spec/features/projects/commit/user_reverts_commit_spec.rb +++ b/spec/features/projects/commit/user_reverts_commit_spec.rb @@ -5,8 +5,8 @@ require 'spec_helper' RSpec.describe 'User reverts a commit', :js do include RepoHelpers + let_it_be(:user) { create(:user) } let(:project) { create(:project, :repository, namespace: user.namespace) } - let(:user) { create(:user) } before do sign_in(user) @@ -14,49 +14,37 @@ RSpec.describe 'User reverts a commit', :js do visit(project_commit_path(project, sample_commit.id)) end - def click_revert + def revert_commit(create_merge_request: false) find('.header-action-buttons .dropdown').click - find('a[href="#modal-revert-commit"]').click - end + find('[data-testid="revert-commit-link"]').click - context 'without creating a new merge request' do - before do - click_revert - page.within('#modal-revert-commit') do - uncheck('create_merge_request') - click_button('Revert') - end + page.within('[data-testid="modal-commit"]') do + uncheck('create_merge_request') unless create_merge_request + click_button('Revert') end + end + context 'without creating a new merge request' do it 'reverts a commit' do + revert_commit + expect(page).to have_content('The commit has been successfully reverted.') end it 'does not revert a previously reverted commit' do + revert_commit # Visit the comment again once it was reverted. visit project_commit_path(project, sample_commit.id) - find('.header-action-buttons .dropdown').click - find('a[href="#modal-revert-commit"]').click - - page.within('#modal-revert-commit') do - uncheck('create_merge_request') - click_button('Revert') - end + revert_commit expect(page).to have_content('Sorry, we cannot revert this commit automatically.') end end context 'with creating a new merge request' do - before do - click_revert - end - it 'reverts a commit' do - page.within('#modal-revert-commit') do - click_button('Revert') - end + revert_commit(create_merge_request: true) expect(page).to have_content('The commit has been successfully reverted. You can now submit a merge request to get this change into the original branch.') expect(page).to have_content("From revert-#{Commit.truncate_sha(sample_commit.id)} into master") |