Commit 17ca2032 authored by Grzegorz Bizon's avatar Grzegorz Bizon

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
parents cb151388 69eddc14
...@@ -28,9 +28,14 @@ module QA ...@@ -28,9 +28,14 @@ module QA
end end
def use_default_credentials def use_default_credentials
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.username = Runtime::User.username
self.password = Runtime::User.password self.password = Runtime::User.password
end end
end
def clone(opts = '') def clone(opts = '')
run_and_redact_credentials("git clone #{opts} #{@uri} ./") run_and_redact_credentials("git clone #{opts} #{@uri} ./")
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module QA module QA
context :create do context :create do
describe 'Git clone over HTTP' do describe 'Git clone over HTTP', :ldap do
let(:location) do let(:location) do
Page::Project::Show.act do Page::Project::Show.act do
choose_repository_clone_http choose_repository_clone_http
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module QA module QA
context :create do context :create do
describe 'Git push over HTTP' do describe 'Git push over HTTP', :ldap do
it 'user pushes code to the repository' do it 'user pushes code to the repository' do
Runtime::Browser.visit(:gitlab, Page::Main::Login) Runtime::Browser.visit(:gitlab, Page::Main::Login)
Page::Main::Login.act { sign_in_using_credentials } Page::Main::Login.act { sign_in_using_credentials }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module QA module QA
context :create do context :create do
describe 'Protected branch support' do describe 'Protected branch support', :ldap do
let(:branch_name) { 'protected-branch' } let(:branch_name) { 'protected-branch' }
let(:commit_message) { 'Protected push commit message' } let(:commit_message) { 'Protected push commit message' }
let(:project) do 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