diff options
| author | Sanad Liaquat <sliaquat@gitlab.com> | 2018-11-16 21:58:07 +0500 |
|---|---|---|
| committer | Sanad Liaquat <sliaquat@gitlab.com> | 2018-11-16 21:58:07 +0500 |
| commit | ef35fc473e0a87697d5f95c39f7fd3475ed9f966 (patch) | |
| tree | 89d562d63d8addba4955ce851ed217583db74857 | |
| parent | 18e6b824200b3e9ef0d958f5308d3ee6a6885cbc (diff) | |
| download | gitlab-ce-qa-staging-15-use-existing-users-ce.tar.gz | |
Implement review feedback from eeqa-staging-15-use-existing-users-ce
| -rw-r--r-- | qa/qa/resource/user.rb | 6 | ||||
| -rw-r--r-- | qa/qa/runtime/env.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/qa/qa/resource/user.rb b/qa/qa/resource/user.rb index 639e6dd0ebf..9be88ba4211 100644 --- a/qa/qa/resource/user.rb +++ b/qa/qa/resource/user.rb @@ -77,13 +77,13 @@ module QA end def self.fabricate_or_use(username, password) - if !Runtime::Env.signup_disabled? - self.fabricate! - else + if Runtime::Env.signup_disabled? self.new.tap do |user| user.username = username user.password = password end + else + self.fabricate! end end diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb index 9d9e4c6fca1..1154eaca6a9 100644 --- a/qa/qa/runtime/env.rb +++ b/qa/qa/runtime/env.rb @@ -76,7 +76,7 @@ module QA end def gitlab_qa_username_1 - ENV['GITLAB_QA_USERNAME_1'] + ENV['GITLAB_QA_USERNAME_1'] || 'gitlab-qa-user1' end def gitlab_qa_password_1 @@ -84,7 +84,7 @@ module QA end def gitlab_qa_username_2 - ENV['GITLAB_QA_USERNAME_2'] + ENV['GITLAB_QA_USERNAME_2'] || 'gitlab-qa-user2' end def gitlab_qa_password_2 |