summaryrefslogtreecommitdiff
path: root/qa/qa/page/project/settings
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2019-01-10 16:53:06 -0500
committerMark Lapierre <mlapierre@gitlab.com>2019-01-11 09:31:57 -0500
commit501a43199e85cc77b15986096717067d47290e80 (patch)
tree3aa58f0ebc06da3e48e2cd89d56c4c324a4baee5 /qa/qa/page/project/settings
parent6b2f81f6078e96f081154c50dc25e54fe7c09d6f (diff)
downloadgitlab-ce-501a43199e85cc77b15986096717067d47290e80.tar.gz
Fix deploy key test
Fetch a specific key's fingerprint instead of all fingerprints. Check for the specific key by title and expected fingerprint. This avoids the use of `all`, which can be unreliable.
Diffstat (limited to 'qa/qa/page/project/settings')
-rw-r--r--qa/qa/page/project/settings/deploy_keys.rb33
1 files changed, 18 insertions, 15 deletions
diff --git a/qa/qa/page/project/settings/deploy_keys.rb b/qa/qa/page/project/settings/deploy_keys.rb
index 3c8c0cbdf7c..5da8d352e74 100644
--- a/qa/qa/page/project/settings/deploy_keys.rb
+++ b/qa/qa/page/project/settings/deploy_keys.rb
@@ -14,8 +14,13 @@ module QA
end
view 'app/assets/javascripts/deploy_keys/components/key.vue' do
- element :key_title, /class=".*qa-key-title.*"/ # rubocop:disable QA/ElementWithPattern
- element :key_fingerprint, /class=".*qa-key-fingerprint.*"/ # rubocop:disable QA/ElementWithPattern
+ element :key
+ element :key_title
+ element :key_fingerprint
+ end
+
+ def add_key
+ click_on 'Add key'
end
def fill_key_title(title)
@@ -26,31 +31,29 @@ module QA
fill_in 'deploy_key_key', with: key
end
- def add_key
- click_on 'Add key'
- end
-
- def key_title
+ def find_fingerprint(title)
within_project_deploy_keys do
- find_element(:key_title).text
+ find_element(:key, title)
+ .find(element_selector_css(:key_fingerprint)).text
end
end
- def key_fingerprint
+ def has_key?(title, fingerprint)
within_project_deploy_keys do
- find_element(:key_fingerprint).text
+ find_element(:key, title)
+ .has_css?(element_selector_css(:key_fingerprint), text: fingerprint)
end
end
- def key_titles
+ def key_title
within_project_deploy_keys do
- all_elements(:key_title)
+ find_element(:key_title).text
end
end
- def key_fingerprints
+ def key_fingerprint
within_project_deploy_keys do
- all_elements(:key_fingerprint)
+ find_element(:key_fingerprint).text
end
end
@@ -58,7 +61,7 @@ module QA
def within_project_deploy_keys
wait(reload: false) do
- has_css?(element_selector_css(:project_deploy_keys))
+ has_element?(:project_deploy_keys)
end
within_element(:project_deploy_keys) do