Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 1 deletions

diff --git a/spec/features/project_variables_spec.rb b/spec/features/project_variables_spec.rb
index ae506a4bad7..69b8408dcd6 100644
--- a/spec/features/project_variables_spec.rb
+++ b/spec/features/project_variables_spec.rb
@@ -16,7 +16,18 @@ RSpec.describe 'Project variables', :js, feature_category: :pipeline_composition
     wait_for_requests
   end
 
-  it_behaves_like 'variable list'
+  context 'when ci_variables_pages FF is enabled' do
+    it_behaves_like 'variable list'
+    it_behaves_like 'variable list pagination', :ci_variable
+  end
+
+  context 'when ci_variables_pages FF is disabled' do
+    before do
+      stub_feature_flags(ci_variables_pages: false)
+    end
+
+    it_behaves_like 'variable list'
+  end
 
   it 'adds a new variable with an environment scope' do
     click_button('Add variable')