From a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Jun 2021 18:25:58 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-0-stable-ee --- spec/controllers/projects/branches_controller_spec.rb | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'spec/controllers/projects/branches_controller_spec.rb') diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb index a99db2664a7..a00e302a64f 100644 --- a/spec/controllers/projects/branches_controller_spec.rb +++ b/spec/controllers/projects/branches_controller_spec.rb @@ -655,21 +655,6 @@ RSpec.describe Projects::BranchesController do ["feature", "improve/awesome", "merge-test", "markdown", "feature_conflict", "'test'"] ) end - - context 'branch_list_keyset_pagination is disabled' do - before do - stub_feature_flags(branch_list_keyset_pagination: false) - end - - it 'sets active and stale branches' do - expect(assigns[:active_branches].map(&:name)).not_to include( - "feature", "improve/awesome", "merge-test", "markdown", "feature_conflict", "'test'" - ) - expect(assigns[:stale_branches].map(&:name)).to eq( - ["feature", "improve/awesome", "merge-test", "markdown", "feature_conflict", "'test'"] - ) - end - end end end -- cgit v1.2.3