Populate the fingerprint by known title

Without this, if we have more than one deploy key, it would be
ambiguous.

3 files changed, 23 insertions, 7 deletions

diff --git a/qa/qa/factory/resource/deploy_key.rb b/qa/qa/factory/resource/deploy_key.rb
index ff0b4a46b77..ea8a3ad687d 100644
--- a/qa/qa/factory/resource/deploy_key.rb
+++ b/qa/qa/factory/resource/deploy_key.rb
@@ -4,15 +4,15 @@ module QA
       class DeployKey < Factory::Base
         attr_accessor :title, :key
 
-        product :title do
+        product :fingerprint do |resource|
           Page::Project::Settings::Repository.act do
-            expand_deploy_keys(&:key_title)
-          end
-        end
+            expand_deploy_keys do |key|
+              key_offset = key.key_titles.index do |title|
+                title.text == resource.title
+              end
 
-        product :fingerprint do
-          Page::Project::Settings::Repository.act do
-            expand_deploy_keys(&:key_fingerprint)
+              key.key_fingerprints[key_offset].text
+            end
           end
         end
 
diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb
index a313d46205d..6fc8004b051 100644
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
@@ -64,6 +64,10 @@ module QA
         find(element_selector_css(name))
       end
 
+      def all_element(name)
+        all(element_selector_css(name))
+      end
+
       def click_element(name)
         find_element(name).click
       end
diff --git a/qa/qa/page/project/settings/deploy_keys.rb b/qa/qa/page/project/settings/deploy_keys.rb
index 332e84724c7..3de064b376a 100644
--- a/qa/qa/page/project/settings/deploy_keys.rb
+++ b/qa/qa/page/project/settings/deploy_keys.rb
@@ -42,6 +42,18 @@ module QA
             end
           end
 
+          def key_titles
+            within_project_deploy_keys do
+              all_element(:key_title)
+            end
+          end
+
+          def key_fingerprints
+            within_project_deploy_keys do
+              all_element(:key_fingerprint)
+            end
+          end
+
           private
 
           def within_project_deploy_keys