summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-02-06 16:27:37 -0800
committerStan Hu <stanhu@gmail.com>2018-02-06 16:27:37 -0800
commit739916748d692194c561b7ad07cd33d867079bed (patch)
treeaa8b0090dad32630922a1367fef261710b0da418 /qa
parentcfa58db8b31899ea3fde9e1d7636ec6420bf1168 (diff)
downloadgitlab-ce-739916748d692194c561b7ad07cd33d867079bed.tar.gz
Address review comments for LDAP QA testsh-add-ldap-qa
Diffstat (limited to 'qa')
-rw-r--r--qa/qa.rb2
-rw-r--r--qa/qa/page/main/login.rb5
-rw-r--r--qa/qa/scenario/test/integration/ldap.rb2
3 files changed, 7 insertions, 2 deletions
diff --git a/qa/qa.rb b/qa/qa.rb
index 3a4c2d575f1..3c7778a4260 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -64,7 +64,7 @@ module QA
autoload :Instance, 'qa/scenario/test/instance'
module Integration
- autoload :Ldap, 'qa/scenario/test/integration/ldap'
+ autoload :LDAP, 'qa/scenario/test/integration/ldap'
autoload :Mattermost, 'qa/scenario/test/integration/mattermost'
end
diff --git a/qa/qa/page/main/login.rb b/qa/qa/page/main/login.rb
index 454573621ce..0d1ffd9694a 100644
--- a/qa/qa/page/main/login.rb
+++ b/qa/qa/page/main/login.rb
@@ -20,6 +20,11 @@ module QA
element :sign_in_button, 'submit_tag "Sign in"'
end
+ view 'app/views/devise/shared/_tabs_ldap.html.haml' do
+ element :ldap_tab, "link_to server['label']"
+ element :standard_tab, "link_to 'Standard'"
+ end
+
def initialize
wait(max: 500) do
page.has_css?('.application')
diff --git a/qa/qa/scenario/test/integration/ldap.rb b/qa/qa/scenario/test/integration/ldap.rb
index 6f68ad9db5c..257ed81d9e1 100644
--- a/qa/qa/scenario/test/integration/ldap.rb
+++ b/qa/qa/scenario/test/integration/ldap.rb
@@ -2,7 +2,7 @@ module QA
module Scenario
module Test
module Integration
- class Ldap < Test::Instance
+ class LDAP < Test::Instance
tags :ldap
end
end