Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
07b6ad35
Commit
07b6ad35
authored
Feb 14, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add LDAP_USERNAME and LDAP_PASSWORD user environment variables for QA
parent
dd633bc1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
2 deletions
+18
-2
qa/qa/page/main/login.rb
qa/qa/page/main/login.rb
+2
-2
qa/qa/runtime/env.rb
qa/qa/runtime/env.rb
+8
-0
qa/qa/runtime/user.rb
qa/qa/runtime/user.rb
+8
-0
No files found.
qa/qa/page/main/login.rb
View file @
07b6ad35
...
...
@@ -53,8 +53,8 @@ module QA
click_link
'LDAP'
fill_in
:username
,
with:
Runtime
::
User
.
name
fill_in
:password
,
with:
Runtime
::
User
.
password
fill_in
:username
,
with:
Runtime
::
User
.
ldap_user
name
fill_in
:password
,
with:
Runtime
::
User
.
ldap_
password
click_button
'Sign in'
end
end
...
...
qa/qa/runtime/env.rb
View file @
07b6ad35
...
...
@@ -35,6 +35,14 @@ module QA
ENV
[
'GITLAB_PASSWORD'
]
end
def
ldap_username
ENV
[
'GITLAB_LDAP_USERNAME'
]
end
def
ldap_password
ENV
[
'GITLAB_LDAP_PASSWORD'
]
end
def
sandbox_name
ENV
[
'GITLAB_SANDBOX_NAME'
]
end
...
...
qa/qa/runtime/user.rb
View file @
07b6ad35
...
...
@@ -18,6 +18,14 @@ module QA
def
ldap_user?
Runtime
::
Env
.
user_type
==
'ldap'
end
def
ldap_username
Runtime
::
Env
.
ldap_username
||
name
end
def
ldap_password
Runtime
::
Env
.
ldap_password
||
password
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment