diff options
Diffstat (limited to 'spec/features/merge_request/user_accepts_merge_request_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_accepts_merge_request_spec.rb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/spec/features/merge_request/user_accepts_merge_request_spec.rb b/spec/features/merge_request/user_accepts_merge_request_spec.rb index 38291573256..e3989a8a192 100644 --- a/spec/features/merge_request/user_accepts_merge_request_spec.rb +++ b/spec/features/merge_request/user_accepts_merge_request_spec.rb @@ -3,8 +3,6 @@ require 'spec_helper' RSpec.describe 'User accepts a merge request', :js, :sidekiq_might_not_need_inline, feature_category: :code_review_workflow do - include ContentEditorHelpers - let(:merge_request) { create(:merge_request, :simple, source_project: project) } let(:project) { create(:project, :public, :repository) } let(:user) { create(:user) } @@ -17,7 +15,6 @@ RSpec.describe 'User accepts a merge request', :js, :sidekiq_might_not_need_inli context 'presents merged merge request content' do it 'when merge method is set to merge commit' do visit(merge_request_path(merge_request)) - close_rich_text_promo_popover_if_present click_merge_button @@ -33,7 +30,6 @@ RSpec.describe 'User accepts a merge request', :js, :sidekiq_might_not_need_inli merge_request = create(:merge_request, :rebased, source_project: project) visit(merge_request_path(merge_request)) - close_rich_text_promo_popover_if_present click_merge_button @@ -44,7 +40,6 @@ RSpec.describe 'User accepts a merge request', :js, :sidekiq_might_not_need_inli merge_request = create(:merge_request, :rebased, source_project: project, squash: true) visit(merge_request_path(merge_request)) - close_rich_text_promo_popover_if_present click_merge_button @@ -56,7 +51,6 @@ RSpec.describe 'User accepts a merge request', :js, :sidekiq_might_not_need_inli context 'with removing the source branch' do before do visit(merge_request_path(merge_request)) - close_rich_text_promo_popover_if_present end it 'accepts a merge request' do @@ -75,7 +69,6 @@ RSpec.describe 'User accepts a merge request', :js, :sidekiq_might_not_need_inli context 'without removing the source branch' do before do visit(merge_request_path(merge_request)) - close_rich_text_promo_popover_if_present end it 'accepts a merge request' do @@ -93,7 +86,6 @@ RSpec.describe 'User accepts a merge request', :js, :sidekiq_might_not_need_inli context 'when a URL has an anchor' do before do visit(merge_request_path(merge_request, anchor: 'note_123')) - close_rich_text_promo_popover_if_present end it 'accepts a merge request' do @@ -114,7 +106,6 @@ RSpec.describe 'User accepts a merge request', :js, :sidekiq_might_not_need_inli merge_request.mark_as_mergeable visit(merge_request_path(merge_request)) - close_rich_text_promo_popover_if_present end it 'accepts a merge request' do |