1 files changed, 47 insertions, 78 deletions

diff --git a/spec/features/admin/admin_deploy_keys_spec.rb b/spec/features/admin/admin_deploy_keys_spec.rb
index 9b74aa2ac5a..88b8fcd8d5e 100644
--- a/spec/features/admin/admin_deploy_keys_spec.rb
+++ b/spec/features/admin/admin_deploy_keys_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe 'admin deploy keys' do
+RSpec.describe 'admin deploy keys', :js do
   include Spec::Support::Helpers::ModalHelpers
 
   let_it_be(:admin) { create(:admin) }
@@ -15,112 +15,81 @@ RSpec.describe 'admin deploy keys' do
     gitlab_enable_admin_mode_sign_in(admin)
   end
 
-  shared_examples 'renders deploy keys correctly' do
-    it 'show all public deploy keys' do
-      visit admin_deploy_keys_path
+  it 'show all public deploy keys' do
+    visit admin_deploy_keys_path
 
-      page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
-        expect(page).to have_content(deploy_key.title)
-        expect(page).to have_content(another_deploy_key.title)
-      end
+    page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
+      expect(page).to have_content(deploy_key.title)
+      expect(page).to have_content(another_deploy_key.title)
     end
+  end
 
-    it 'shows all the projects the deploy key has write access' do
-      write_key = create(:deploy_keys_project, :write_access, deploy_key: deploy_key)
+  it 'shows all the projects the deploy key has write access' do
+    write_key = create(:deploy_keys_project, :write_access, deploy_key: deploy_key)
 
-      visit admin_deploy_keys_path
+    visit admin_deploy_keys_path
 
-      page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
-        expect(page).to have_content(write_key.project.full_name)
-      end
+    page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
+      expect(page).to have_content(write_key.project.full_name)
     end
+  end
 
-    describe 'create a new deploy key' do
-      let(:new_ssh_key) { attributes_for(:key)[:key] }
-
-      before do
-        visit admin_deploy_keys_path
-        click_link 'New deploy key'
-      end
-
-      it 'creates a new deploy key' do
-        fill_in 'deploy_key_title', with: 'laptop'
-        fill_in 'deploy_key_key', with: new_ssh_key
-        click_button 'Create'
-
-        expect(current_path).to eq admin_deploy_keys_path
+  describe 'create a new deploy key' do
+    let(:new_ssh_key) { attributes_for(:key)[:key] }
 
-        page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
-          expect(page).to have_content('laptop')
-        end
-      end
+    before do
+      visit admin_deploy_keys_path
+      click_link 'New deploy key'
     end
 
-    describe 'update an existing deploy key' do
-      before do
-        visit admin_deploy_keys_path
-        page.within('tr', text: deploy_key.title) do
-          click_link(_('Edit deploy key'))
-        end
-      end
+    it 'creates a new deploy key' do
+      fill_in 'deploy_key_title', with: 'laptop'
+      fill_in 'deploy_key_key', with: new_ssh_key
+      click_button 'Create'
 
-      it 'updates an existing deploy key' do
-        fill_in 'deploy_key_title', with: 'new-title'
-        click_button 'Save changes'
+      expect(current_path).to eq admin_deploy_keys_path
 
-        expect(current_path).to eq admin_deploy_keys_path
-
-        page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
-          expect(page).to have_content('new-title')
-        end
+      page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
+        expect(page).to have_content('laptop')
       end
     end
   end
 
-  context 'when `admin_deploy_keys_vue` feature flag is enabled', :js do
-    it_behaves_like 'renders deploy keys correctly'
-
-    describe 'remove an existing deploy key' do
-      before do
-        visit admin_deploy_keys_path
+  describe 'update an existing deploy key' do
+    before do
+      visit admin_deploy_keys_path
+      page.within('tr', text: deploy_key.title) do
+        click_link(_('Edit deploy key'))
       end
+    end
 
-      it 'removes an existing deploy key' do
-        accept_gl_confirm('Are you sure you want to delete this deploy key?', button_text: 'Delete') do
-          page.within('tr', text: deploy_key.title) do
-            click_button _('Delete deploy key')
-          end
-        end
+    it 'updates an existing deploy key' do
+      fill_in 'deploy_key_title', with: 'new-title'
+      click_button 'Save changes'
 
-        expect(current_path).to eq admin_deploy_keys_path
-        page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
-          expect(page).not_to have_content(deploy_key.title)
-        end
+      expect(current_path).to eq admin_deploy_keys_path
+
+      page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
+        expect(page).to have_content('new-title')
       end
     end
   end
 
-  context 'when `admin_deploy_keys_vue` feature flag is disabled' do
+  describe 'remove an existing deploy key' do
     before do
-      stub_feature_flags(admin_deploy_keys_vue: false)
+      visit admin_deploy_keys_path
     end
 
-    it_behaves_like 'renders deploy keys correctly'
-
-    describe 'remove an existing deploy key' do
-      before do
-        visit admin_deploy_keys_path
-      end
-
-      it 'removes an existing deploy key' do
+    it 'removes an existing deploy key' do
+      accept_gl_confirm('Are you sure you want to delete this deploy key?', button_text: 'Delete') do
         page.within('tr', text: deploy_key.title) do
-          click_link _('Remove deploy key')
+          click_button _('Delete deploy key')
         end
+      end
 
-        expect(current_path).to eq admin_deploy_keys_path
-        page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
-          expect(page).not_to have_content(deploy_key.title)
-        end
+      expect(current_path).to eq admin_deploy_keys_path
+      page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
+        expect(page).not_to have_content(deploy_key.title)
       end
     end
   end