summaryrefslogtreecommitdiff
path: root/qa/qa.rb
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2019-07-25 17:12:25 +1000
committerMark Lapierre <mlapierre@gitlab.com>2019-07-25 17:12:25 +1000
commit8c5a499cb099333d36501331baf11a43e245a834 (patch)
tree34a69f0b08110af0b44998ab41a32312daddd62e /qa/qa.rb
parent631b499ad17e9363060856c1cf85fe396a11e63f (diff)
downloadgitlab-ce-qa-ml-parallel-tests-fix-failures.tar.gz
Assert SSH key was added before using itqa-ml-parallel-tests-fix-failures
The test would sometimes fail because it added an SSH key via the UI but tried to use it before the server had completed adding it. This also moves the code to delete the SSH key to an after hook so that it runs even if the test fails midway, e.g., if it fails during the push. It also adds an `element_text` method to wrap Capybara's `.text` in a method that we won't have to change later if we switch to a different framework. Finally, it adds an Assertions module that contains assertions we can use where `expect` is not appropriate (and wraps Capybara methods)
Diffstat (limited to 'qa/qa.rb')
-rw-r--r--qa/qa.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/qa/qa.rb b/qa/qa.rb
index be73776425b..47070fec78a 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -126,6 +126,7 @@ module QA
# Needed to execute click-driven-only black-box tests.
#
module Page
+ autoload :Assertions, 'qa/page/assertions'
autoload :Base, 'qa/page/base'
autoload :View, 'qa/page/view'
autoload :Element, 'qa/page/element'
@@ -268,6 +269,7 @@ module QA
autoload :Menu, 'qa/page/profile/menu'
autoload :PersonalAccessTokens, 'qa/page/profile/personal_access_tokens'
autoload :SSHKeys, 'qa/page/profile/ssh_keys'
+ autoload :SSHKey, 'qa/page/profile/ssh_key'
end
module Issuable