diff options
Diffstat (limited to 'spec/features/merge_request/user_sees_diff_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_sees_diff_spec.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/spec/features/merge_request/user_sees_diff_spec.rb b/spec/features/merge_request/user_sees_diff_spec.rb index d067fc0ada4..7a3a14e61e3 100644 --- a/spec/features/merge_request/user_sees_diff_spec.rb +++ b/spec/features/merge_request/user_sees_diff_spec.rb @@ -9,10 +9,6 @@ RSpec.describe 'Merge request > User sees diff', :js do let(:project) { create(:project, :public, :repository) } let(:merge_request) { create(:merge_request, source_project: project) } - before do - stub_feature_flags(diffs_batch_load: false) - end - context 'when linking to note' do describe 'with unresolved note' do let(:note) { create :diff_note_on_merge_request, project: project, noteable: merge_request } @@ -72,7 +68,7 @@ RSpec.describe 'Merge request > User sees diff', :js do end context 'as user who needs to fork' do - it 'shows fork/cancel confirmation', :sidekiq_might_not_need_inline, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/196749' do + it 'shows fork/cancel confirmation', :sidekiq_might_not_need_inline do sign_in(user) visit diffs_project_merge_request_path(project, merge_request) @@ -97,7 +93,7 @@ RSpec.describe 'Merge request > User sees diff', :js do let c = 3; let d = 3; } - CONTENT + CONTENT new_file_content = <<~CONTENT @@ -107,7 +103,7 @@ RSpec.describe 'Merge request > User sees diff', :js do let c = 3; let x = 3; } - CONTENT + CONTENT file_name = 'xss_file.rs' |