diff options
Diffstat (limited to 'spec/features/merge_request/user_sees_merge_widget_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_sees_merge_widget_spec.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb index 1db09790e1c..96cad397441 100644 --- a/spec/features/merge_request/user_sees_merge_widget_spec.rb +++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb @@ -6,7 +6,6 @@ RSpec.describe 'Merge request > User sees merge widget', :js, feature_category: include ProjectForksHelper include TestReportsHelper include ReactiveCachingHelpers - include ContentEditorHelpers let(:project) { create(:project, :repository) } let(:project_only_mwps) { create(:project, :repository, only_allow_merge_if_pipeline_succeeds: true) } @@ -58,7 +57,6 @@ RSpec.describe 'Merge request > User sees merge widget', :js, feature_category: merge_request.update!(head_pipeline: pipeline) deployment.update!(status: :success) visit project_merge_request_path(project, merge_request) - close_rich_text_promo_popover_if_present end it 'shows environments link' do @@ -132,7 +130,6 @@ RSpec.describe 'Merge request > User sees merge widget', :js, feature_category: create(:ci_build, :pending, pipeline: pipeline) visit project_merge_request_path(project, merge_request) - close_rich_text_promo_popover_if_present end it 'has merge button that shows modal when pipeline does not succeeded' do @@ -409,7 +406,6 @@ RSpec.describe 'Merge request > User sees merge widget', :js, feature_category: before do allow_any_instance_of(Repository).to receive(:merge).and_return(false) visit project_merge_request_path(project, merge_request) - close_rich_text_promo_popover_if_present end it 'updates the MR widget', :sidekiq_might_not_need_inline do @@ -431,7 +427,6 @@ RSpec.describe 'Merge request > User sees merge widget', :js, feature_category: sign_in(user2) merge_request.update!(source_project: forked_project) visit project_merge_request_path(project, merge_request) - close_rich_text_promo_popover_if_present end it 'user can merge into the target project', :sidekiq_inline do @@ -469,7 +464,6 @@ RSpec.describe 'Merge request > User sees merge widget', :js, feature_category: allow_any_instance_of(MergeRequest).to receive(:merge_ongoing?).and_return(true) visit project_merge_request_path(project, merge_request) - close_rich_text_promo_popover_if_present wait_for_requests |