1 files changed, 15 insertions, 48 deletions
diff --git a/spec/features/project_variables_spec.rb b/spec/features/project_variables_spec.rb
index d3bedbf3a75..33b4af3b5aa 100644
--- a/spec/features/project_variables_spec.rb
+++ b/spec/features/project_variables_spec.rb
@@ -12,62 +12,29 @@ RSpec.describe 'Project variables', :js do
     sign_in(user)
     project.add_maintainer(user)
     project.variables << variable
+    visit page_path
+    wait_for_requests
   end
 
-  context 'with disabled ff `ci_variable_settings_graphql' do
-    before do
-      stub_feature_flags(ci_variable_settings_graphql: false)
-      visit page_path
-    end
-
-    it_behaves_like 'variable list'
-
-    it 'adds a new variable with an environment scope' do
-      click_button('Add variable')
-
-      page.within('#add-ci-variable') do
-        fill_in 'Key', with: 'akey'
-        find('#ci-variable-value').set('akey_value')
-        find('[data-testid="environment-scope"]').click
-        find('[data-testid="ci-environment-search"]').set('review/*')
-        find('[data-testid="create-wildcard-button"]').click
-
-        click_button('Add variable')
-      end
-
-      wait_for_requests
+  it_behaves_like 'variable list'
 
-      page.within('[data-testid="ci-variable-table"]') do
-        expect(find('.js-ci-variable-row:first-child [data-label="Environments"]').text).to eq('review/*')
-      end
-    end
-  end
-
-  context 'with enabled ff `ci_variable_settings_graphql' do
-    before do
-      visit page_path
-    end
+  it 'adds a new variable with an environment scope' do
+    click_button('Add variable')
 
-    it_behaves_like 'variable list'
+    page.within('#add-ci-variable') do
+      fill_in 'Key', with: 'akey'
+      find('#ci-variable-value').set('akey_value')
+      find('[data-testid="environment-scope"]').click
+      find('[data-testid="ci-environment-search"]').set('review/*')
+      find('[data-testid="create-wildcard-button"]').click
 
-    it 'adds a new variable with an environment scope' do
       click_button('Add variable')
+    end
 
-      page.within('#add-ci-variable') do
-        fill_in 'Key', with: 'akey'
-        find('#ci-variable-value').set('akey_value')
-        find('[data-testid="environment-scope"]').click
-        find('[data-testid="ci-environment-search"]').set('review/*')
-        find('[data-testid="create-wildcard-button"]').click
-
-        click_button('Add variable')
-      end
-
-      wait_for_requests
+    wait_for_requests
 
-      page.within('[data-testid="ci-variable-table"]') do
-        expect(find('.js-ci-variable-row:first-child [data-label="Environments"]').text).to eq('review/*')
-      end
+    page.within('[data-testid="ci-variable-table"]') do
+      expect(find('.js-ci-variable-row:first-child [data-label="Environments"]').text).to eq('review/*')
     end
   end
 end