Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 12 deletions

diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/ssh_key_support_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/ssh_key_support_spec.rb
index a2fe79ae65d..fb9ffc5359e 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/ssh_key_support_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/ssh_key_support_spec.rb
@@ -5,8 +5,6 @@ module QA
     describe 'SSH keys support', :smoke, product_group: :source_code do
       let(:key_title) { "key for ssh tests #{Time.now.to_f}" }
 
-      key = nil
-
       before do
         Flow::Login.sign_in
       end
@@ -20,18 +18,19 @@ module QA
         expect(page).to have_content(key.sha256_fingerprint)
       end
 
-      # Note this context ensures that the example it contains is executed after the example above. Be aware of the order of execution if you add new examples in either context.
-      context 'after adding an ssh key' do
-        it 'can delete an ssh key', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347820' do
-          Page::Main::Menu.perform(&:click_edit_profile_link)
-          Page::Profile::Menu.perform(&:click_ssh_keys)
-          Page::Profile::SSHKeys.perform do |ssh_keys|
-            ssh_keys.remove_key(key.title)
-          end
+      it 'can delete an ssh key', testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347820' do
+        key = Resource::SSHKey.fabricate_via_api! do |resource|
+          resource.title = key_title
+        end
 
-          expect(page).not_to have_content(key.title)
-          expect(page).not_to have_content(key.sha256_fingerprint)
+        Page::Main::Menu.perform(&:click_edit_profile_link)
+        Page::Profile::Menu.perform(&:click_ssh_keys)
+        Page::Profile::SSHKeys.perform do |ssh_keys|
+          ssh_keys.remove_key(key.title)
         end
+
+        expect(page).not_to have_content(key.title)
+        expect(page).not_to have_content(key.sha256_fingerprint)
       end
     end
   end