summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qa/qa/page/project/settings/common.rb4
-rw-r--r--qa/qa/page/project/settings/deploy_keys.rb19
-rw-r--r--qa/qa/page/project/settings/repository.rb11
3 files changed, 19 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..bf42767c707 100644
--- a/qa/qa/page/project/settings/deploy_keys.rb
+++ b/qa/qa/page/project/settings/deploy_keys.rb
@@ -3,12 +3,19 @@ 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, /class=".*deploy\-keys.*"/
+ end
+
+ view 'app/assets/javascripts/deploy_keys/components/key.vue' do
+ element :key_title, /class=".*title.*"/
+ element :key_title_field, '{{ deployKey.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