From e268575b08ccaf30a844fdb37898d680d0cbb98d Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Mon, 15 Jan 2018 22:38:15 +0800
Subject: [PATCH 1/2] Add view elements to deploy keys pages

---
 qa/qa/page/project/settings/common.rb      |  4 ++--
 qa/qa/page/project/settings/deploy_keys.rb | 18 ++++++++++++------
 qa/qa/page/project/settings/repository.rb  | 11 ++++-------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/qa/qa/page/project/settings/common.rb b/qa/qa/page/project/settings/common.rb
index 5d1d5120929..b4ef07e1540 100644
--- a/qa/qa/page/project/settings/common.rb
+++ b/qa/qa/page/project/settings/common.rb
@@ -3,9 +3,9 @@ module QA
     module Project
       module Settings
         module Common
-          def expand(selector)
+          def expand(element_name)
             page.within('#content-body') do
-              find(selector).click
+              click_element(element_name)
 
               yield
             end
diff --git a/qa/qa/page/project/settings/deploy_keys.rb b/qa/qa/page/project/settings/deploy_keys.rb
index a8d6f09777c..c6a07b59493 100644
--- a/qa/qa/page/project/settings/deploy_keys.rb
+++ b/qa/qa/page/project/settings/deploy_keys.rb
@@ -3,12 +3,18 @@ module QA
     module Project
       module Settings
         class DeployKeys < Page::Base
-          ##
-          # TODO, define all selectors required by this page object
-          #
-          # See gitlab-org/gitlab-qa#154
-          #
-          view 'app/views/projects/deploy_keys/edit.html.haml'
+          view 'app/views/projects/deploy_keys/_form.html.haml' do
+            element :deploy_key_title, 'text_field :title'
+            element :deploy_key_key, 'text_area :key'
+          end
+
+          view 'app/assets/javascripts/deploy_keys/components/app.vue' do
+            element :deploy_keys_section, 'deploy-keys'
+          end
+
+          view 'app/assets/javascripts/deploy_keys/components/key.vue' do
+            element :key_title, 'class="title"'
+          end
 
           def fill_key_title(title)
             fill_in 'deploy_key_title', with: title
diff --git a/qa/qa/page/project/settings/repository.rb b/qa/qa/page/project/settings/repository.rb
index 524d87c6be9..6cc68358c8c 100644
--- a/qa/qa/page/project/settings/repository.rb
+++ b/qa/qa/page/project/settings/repository.rb
@@ -5,15 +5,12 @@ module QA
         class Repository < Page::Base
           include Common
 
-          ##
-          # TODO, define all selectors required by this page object
-          #
-          # See gitlab-org/gitlab-qa#154
-          #
-          view 'app/views/projects/settings/repository/show.html.haml'
+          view 'app/views/projects/deploy_keys/_index.html.haml' do
+            element :expand_deploy_keys
+          end
 
           def expand_deploy_keys(&block)
-            expand('.qa-expand-deploy-keys') do
+            expand(:expand_deploy_keys) do
               DeployKeys.perform(&block)
             end
           end

From d56f059cd2ae4b89c4f5955b3892f8227e5eef11 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Tue, 16 Jan 2018 22:29:45 +0800
Subject: [PATCH 2/2] Try to match more aggressively

---
 qa/qa/page/project/settings/deploy_keys.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/qa/qa/page/project/settings/deploy_keys.rb b/qa/qa/page/project/settings/deploy_keys.rb
index c6a07b59493..bf42767c707 100644
--- a/qa/qa/page/project/settings/deploy_keys.rb
+++ b/qa/qa/page/project/settings/deploy_keys.rb
@@ -9,11 +9,12 @@ module QA
           end
 
           view 'app/assets/javascripts/deploy_keys/components/app.vue' do
-            element :deploy_keys_section, 'deploy-keys'
+            element :deploy_keys_section, /class=".*deploy\-keys.*"/
           end
 
           view 'app/assets/javascripts/deploy_keys/components/key.vue' do
-            element :key_title, 'class="title"'
+            element :key_title, /class=".*title.*"/
+            element :key_title_field, '{{ deployKey.title }}'
           end
 
           def fill_key_title(title)