summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Davison <ddavison@gitlab.com>2019-05-31 04:54:32 +0000
committerDan Davison <ddavison@gitlab.com>2019-05-31 04:54:32 +0000
commit9b300c9799d519d4ed30c4a54ff89c49e1f09da9 (patch)
tree6b82764cbc7fcf12d017b05e0792ea3ac36240dc
parent8ab0db4e8f74457c419e913dc6af6296a0a9fa52 (diff)
parent3f51df04ed0389154d1a17dbf899bd050ff68b52 (diff)
downloadgitlab-ce-9b300c9799d519d4ed30c4a54ff89c49e1f09da9.tar.gz
Merge branch 'qa-fix-api-client-login-validation' into 'master'
[QA] Allow login validation before creating personal access token See merge request gitlab-org/gitlab-ce!28960
-rw-r--r--qa/qa/runtime/api/client.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/qa/qa/runtime/api/client.rb b/qa/qa/runtime/api/client.rb
index 58de01705d7..40a3bc85195 100644
--- a/qa/qa/runtime/api/client.rb
+++ b/qa/qa/runtime/api/client.rb
@@ -25,15 +25,12 @@ module QA
private
def create_personal_access_token
- if @is_new_session
- Runtime::Browser.visit(@address, Page::Main::Login) { do_create_personal_access_token }
- else
- do_create_personal_access_token
- end
+ Runtime::Browser.visit(@address, Page::Main::Login) if @is_new_session
+ do_create_personal_access_token
end
def do_create_personal_access_token
- Page::Main::Login.act { sign_in_using_credentials }
+ Page::Main::Login.perform(&:sign_in_using_credentials)
Resource::PersonalAccessToken.fabricate!.access_token
end
end