Commit 27860a74 authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

Merge branch 'sh-test-ldap-clones-via-gitlab-qa' into 'master'

QA: Add support for testing Git over HTTP with LDAP users

See merge request gitlab-org/gitlab-ce!21354
......@@ -28,8 +28,13 @@ def password=(pass)
end
def use_default_credentials
self.username = Runtime::User.username
self.password = Runtime::User.password
if ::QA::Runtime::User.ldap_user?
self.username = Runtime::User.ldap_username
self.password = Runtime::User.ldap_password
else
self.username = Runtime::User.username
self.password = Runtime::User.password
end
end
def clone(opts = '')
......
......@@ -2,7 +2,7 @@
module QA
context :create do
describe 'Git clone over HTTP' do
describe 'Git clone over HTTP', :ldap do
let(:location) do
Page::Project::Show.act do
choose_repository_clone_http
......
......@@ -2,7 +2,7 @@
module QA
context :create do
describe 'Git push over HTTP' do
describe 'Git push over HTTP', :ldap do
it 'user pushes code to the repository' do
Runtime::Browser.visit(:gitlab, Page::Main::Login)
Page::Main::Login.act { sign_in_using_credentials }
......
......@@ -2,7 +2,7 @@
module QA
context :create do
describe 'Protected branch support' do
describe 'Protected branch support', :ldap do
let(:branch_name) { 'protected-branch' }
let(:commit_message) { 'Protected push commit message' }
let(:project) do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment