diff options
Diffstat (limited to 'spec/features/merge_request/user_merges_merge_request_spec.rb')
-rw-r--r-- | spec/features/merge_request/user_merges_merge_request_spec.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/spec/features/merge_request/user_merges_merge_request_spec.rb b/spec/features/merge_request/user_merges_merge_request_spec.rb index ede686cc700..111204a7105 100644 --- a/spec/features/merge_request/user_merges_merge_request_spec.rb +++ b/spec/features/merge_request/user_merges_merge_request_spec.rb @@ -3,7 +3,7 @@ require "spec_helper" RSpec.describe "User merges a merge request", :js, feature_category: :code_review_workflow do - let_it_be(:user) { create(:user, :no_super_sidebar) } + let_it_be(:user) { create(:user) } before do sign_in(user) @@ -21,7 +21,8 @@ RSpec.describe "User merges a merge request", :js, feature_category: :code_revie end end - context 'sidebar merge requests counter' do + # Pending re-implementation: https://gitlab.com/gitlab-org/gitlab/-/issues/429268 + xcontext 'sidebar merge requests counter' do let_it_be(:project) { create(:project, :public, :repository, namespace: user.namespace) } let!(:merge_request) { create(:merge_request, source_project: project) } |