Merge branch '48159-qa-specs-features-login-ldap_spec-rb-is-failing-after-https-gitlab-com-gitlab-org-gitlab-ce-merge_requests-19964' into 'master'
Resolve "qa/specs/features/login/ldap_spec.rb is failing after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19964" Closes #48159 See merge request gitlab-org/gitlab-ce!20027
This commit is contained in:
commit
73db8232a2
|
|
@ -3,6 +3,8 @@ module QA
|
|||
module Env
|
||||
extend self
|
||||
|
||||
attr_writer :user_type
|
||||
|
||||
# set to 'false' to have Chrome run visibly instead of headless
|
||||
def chrome_headless?
|
||||
(ENV['CHROME_HEADLESS'] =~ /^(false|no|0)$/i) != 0
|
||||
|
|
@ -20,7 +22,9 @@ module QA
|
|||
# By default, "standard" denotes a standard GitLab user login.
|
||||
# Set this to "ldap" if the user should be logged in via LDAP.
|
||||
def user_type
|
||||
(ENV['GITLAB_USER_TYPE'] || 'standard').tap do |type|
|
||||
return @user_type if defined?(@user_type) # rubocop:disable Gitlab/ModuleWithInstanceVariables
|
||||
|
||||
ENV.fetch('GITLAB_USER_TYPE', 'standard').tap do |type|
|
||||
unless %w(ldap standard).include?(type)
|
||||
raise ArgumentError.new("Invalid user type '#{type}': must be 'ldap' or 'standard'")
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,8 +1,12 @@
|
|||
module QA
|
||||
feature 'LDAP user login', :ldap do
|
||||
before do
|
||||
Runtime::Env.user_type = 'ldap'
|
||||
end
|
||||
|
||||
scenario 'user logs in using LDAP credentials' do
|
||||
Runtime::Browser.visit(:gitlab, Page::Main::Login)
|
||||
Page::Main::Login.act { sign_in_using_ldap_credentials }
|
||||
Page::Main::Login.act { sign_in_using_credentials }
|
||||
|
||||
# TODO, since `Signed in successfully` message was removed
|
||||
# this is the only way to tell if user is signed in correctly.
|
||||
|
|
|
|||
Loading…
Reference in New Issue