1 files changed, 17 insertions, 6 deletions
diff --git a/spec/features/projects/branches_spec.rb b/spec/features/projects/branches_spec.rb
index 6a13d5637af..50df7bb7ca5 100644
--- a/spec/features/projects/branches_spec.rb
+++ b/spec/features/projects/branches_spec.rb
@@ -95,15 +95,22 @@ RSpec.describe 'Branches', feature_category: :groups_and_projects do
         it 'shows only default_per_page active branches sorted by last updated' do
           visit project_branches_filtered_path(project, state: 'active')
 
-          expect(page).to have_content(sorted_branches(repository, count: Kaminari.config.default_per_page,
-                                                                   sort_by: :updated_desc, state: 'active'))
+          expect(page).to have_content(sorted_branches(
+            repository,
+            count: Kaminari.config.default_per_page,
+            sort_by: :updated_desc,
+            state: 'active'
+          ))
         end
 
         it 'shows only default_per_page branches sorted by last updated on All branches' do
           visit project_branches_filtered_path(project, state: 'all')
 
-          expect(page).to have_content(sorted_branches(repository, count: Kaminari.config.default_per_page,
-                                                                   sort_by: :updated_desc))
+          expect(page).to have_content(sorted_branches(
+            repository,
+            count: Kaminari.config.default_per_page,
+            sort_by: :updated_desc
+          ))
         end
       end
     end
@@ -161,11 +168,15 @@ RSpec.describe 'Branches', feature_category: :groups_and_projects do
       end
 
       it 'avoids a N+1 query in branches index' do
+        new_branches_count = 20
+        sql_queries_count_threshold = 10
+
         control_count = ActiveRecord::QueryRecorder.new { visit project_branches_path(project) }.count
 
-        %w[one two three four five].each { |ref| repository.add_branch(user, ref, 'master') }
+        (1..new_branches_count).each { |number| repository.add_branch(user, "new-branch-#{number}", 'master') }
 
-        expect { visit project_branches_filtered_path(project, state: 'all') }.not_to exceed_query_limit(control_count)
+        expect { visit project_branches_filtered_path(project, state: 'all') }
+          .not_to exceed_query_limit(control_count).with_threshold(sql_queries_count_threshold)
       end
     end