diff options
Diffstat (limited to 'spec/features/user_sees_revert_modal_spec.rb')
-rw-r--r-- | spec/features/user_sees_revert_modal_spec.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/features/user_sees_revert_modal_spec.rb b/spec/features/user_sees_revert_modal_spec.rb index aca32d26bdb..9ee3fe846a6 100644 --- a/spec/features/user_sees_revert_modal_spec.rb +++ b/spec/features/user_sees_revert_modal_spec.rb @@ -3,7 +3,9 @@ require 'spec_helper' RSpec.describe 'Merge request > User sees revert modal', :js, :sidekiq_might_not_need_inline, -feature_category: :code_review_workflow do + feature_category: :code_review_workflow do + include ContentEditorHelpers + let(:project) { create(:project, :public, :repository) } let(:user) { project.creator } let(:merge_request) { create(:merge_request, source_project: project) } @@ -22,6 +24,8 @@ feature_category: :code_review_workflow do stub_feature_flags(unbatch_graphql_queries: false) sign_in(user) visit(project_merge_request_path(project, merge_request)) + close_rich_text_promo_popover_if_present + page.within('.mr-state-widget') do click_button 'Merge' end @@ -36,6 +40,7 @@ feature_category: :code_review_workflow do context 'with page reload validates js correctly loaded' do before do visit(merge_request_path(merge_request)) + close_rich_text_promo_popover_if_present end it_behaves_like 'showing the revert modal' |