Merge remote-tracking branch 'upstream/master' into qa-secret-variables-scenarioqa-secret-variables-scenario

* upstream/master:
  Make Gitaly RepositoryExists opt-out
  Fix .batch_lfs_pointers accepting a lazy enumerator
  Look at notes created just before merge when deciding if an MR can be reverted
  Update missing paths
  Default to HTTPS for all Gravatar URLs
  Add note within ux documentation that further changes should be made within the design.gitlab project
  Moves status icon into a vue file and adds tests Moves merging component into a vue file, adds i18n and better test cases
  Prefer local variables instead
  Add an test for QA::Runtime::RSAKey
  Move initialize method later.
  Also test if the fingerprint is correct
  Generate ssh key on the fly for QA

1 files changed, 18 insertions, 4 deletions

diff --git a/qa/qa/page/project/settings/deploy_keys.rb b/qa/qa/page/project/settings/deploy_keys.rb
index f9e40bf4252..332e84724c7 100644
--- a/qa/qa/page/project/settings/deploy_keys.rb
+++ b/qa/qa/page/project/settings/deploy_keys.rb
@@ -14,8 +14,8 @@ module QA
           end
 
           view 'app/assets/javascripts/deploy_keys/components/key.vue' do
-            element :key_title, /class=".*title.*"/
-            element :key_title_field, '{{ deployKey.title }}'
+            element :key_title, /class=".*qa-key-title.*"/
+            element :key_fingerprint, /class=".*qa-key-fingerprint.*"/
           end
 
           def fill_key_title(title)
@@ -31,8 +31,22 @@ module QA
           end
 
           def key_title
-            page.within('.qa-project-deploy-keys') do
-              page.find('.title').text
+            within_project_deploy_keys do
+              find_element(:key_title).text
+            end
+          end
+
+          def key_fingerprint
+            within_project_deploy_keys do
+              find_element(:key_fingerprint).text
+            end
+          end
+
+          private
+
+          def within_project_deploy_keys
+            within_element(:project_deploy_keys) do
+              yield
             end
           end
         end