Merge branch '344927-refactor-admin-deploy-keys-table-to-vue-update-feature-specs' into 'master'

Updates admin deploy keys feature specs after refactoring to Vue

See merge request gitlab-org/gitlab!75574

spec/features/admin/admin_deploy_keys_spec.rb

@@ -3,101 +3,125 @@
 require 'spec_helper'
 
 RSpec.describe 'admin deploy keys' do
+  include Spec::Support::Helpers::ModalHelpers
+
   let_it_be(:admin) { create(:admin) }
 
   let!(:deploy_key) { create(:deploy_key, public: true) }
   let!(:another_deploy_key) { create(:another_deploy_key, public: true) }
 
   before do
-    stub_feature_flags(admin_deploy_keys_vue: false)
     sign_in(admin)
     gitlab_enable_admin_mode_sign_in(admin)
   end
 
-  it 'show all public deploy keys' do
-    visit admin_deploy_keys_path
+  shared_examples 'renders deploy keys correctly' do
+    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)
+      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
-  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)
+      page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
+        expect(page).to have_content(write_key.project.full_name)
+      end
     end
-  end
 
-  describe 'create a new deploy key' do
-    let(:new_ssh_key) { attributes_for(:key)[:key] }
+    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
+      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'
+      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
+        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('laptop')
+        page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
+          expect(page).to have_content('laptop')
+        end
       end
     end
-  end
 
-  describe 'update an existing deploy key' do
-    before do
-      visit admin_deploy_keys_path
-      find('tr', text: deploy_key.title).click_link('Edit')
-    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 'updates an existing deploy key' do
-      fill_in 'deploy_key_title', with: 'new-title'
-      click_button 'Save changes'
+      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')
+        page.within(find('[data-testid="deploy-keys-list"]', match: :first)) do
+          expect(page).to have_content('new-title')
+        end
       end
     end
   end
 
-  describe 'remove an existing deploy key' do
-    before do
-      visit admin_deploy_keys_path
-    end
+  context 'when `admin_deploy_keys_vue` feature flag is enabled', :js do
+    it_behaves_like 'renders deploy keys correctly'
 
-    it 'removes an existing deploy key' do
-      find('tr', text: deploy_key.title).click_link('Remove')
+    describe 'remove an existing deploy key' do
+      before do
+        visit admin_deploy_keys_path
+      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)
+      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
+
+        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
   end
 
-  context 'when `admin_deploy_keys_vue` feature flag is enabled', :js do
+  context 'when `admin_deploy_keys_vue` feature flag is disabled' do
     before do
-      stub_feature_flags(admin_deploy_keys_vue: true)
-
-      visit admin_deploy_keys_path
+      stub_feature_flags(admin_deploy_keys_vue: false)
     end
 
-    it 'renders the Vue app', :aggregate_failures do
-      expect(page).to have_content('Public deploy keys')
-      expect(page).to have_selector('[data-testid="deploy-keys-list"]')
-      expect(page).to have_link('New deploy key', href: new_admin_deploy_key_path)
+    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
+        page.within('tr', text: deploy_key.title) do
+          click_link _('Remove deploy key')
+        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
   end
 end