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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9eaffcbd
Commit
9eaffcbd
authored
Jan 10, 2020
by
Sanad Liaquat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix issue with unstable UI state when disabling SSO features
parent
6e88bebc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
14 deletions
+23
-14
qa/qa/ee/page/group/settings/saml_sso.rb
qa/qa/ee/page/group/settings/saml_sso.rb
+8
-0
qa/qa/specs/features/ee/browser_ui/1_manage/group/group_saml_sso_spec.rb
...tures/ee/browser_ui/1_manage/group/group_saml_sso_spec.rb
+15
-14
No files found.
qa/qa/ee/page/group/settings/saml_sso.rb
View file @
9eaffcbd
...
...
@@ -37,6 +37,10 @@ module QA
end
end
def
has_enforce_sso_button?
has_element?
(
:enforced_sso_toggle_button
,
wait:
1.0
)
end
def
disable_enforce_sso
Support
::
Retrier
.
retry_until
(
sleep_interval:
1.0
,
raise_on_failure:
true
)
do
click_element
:enforced_sso_toggle_button
if
find_element
(
:enforced_sso_toggle_button
)[
:class
].
include?
(
'is-checked'
)
...
...
@@ -44,6 +48,10 @@ module QA
end
end
def
has_group_managed_accounts_button?
has_element?
(
:group_managed_accounts_toggle_button
,
wait:
1.0
)
end
def
enable_group_managed_accounts
Support
::
Retrier
.
retry_until
(
sleep_interval:
1.0
,
raise_on_failure:
true
)
do
click_element
:group_managed_accounts_toggle_button
unless
find_element
(
:group_managed_accounts_toggle_button
)[
:class
].
include?
(
'is-checked'
)
...
...
qa/qa/specs/features/ee/browser_ui/1_manage/group/group_saml_sso_spec.rb
View file @
9eaffcbd
...
...
@@ -348,24 +348,25 @@ module QA
end
def
disable_enforce_sso_and_group_managed_account
Runtime
::
Logger
.
info
(
'Disabling enforce sso and group managed account'
)
if
Runtime
::
Feature
.
enabled?
(
'enforced_sso'
)
||
Runtime
::
Feature
.
enabled?
(
'group_managed_accounts'
)
Runtime
::
Logger
.
info
(
'Disabling enforce sso and/or group managed account'
)
page
.
visit
Runtime
::
Scenario
.
gitlab_address
Support
::
Retrier
.
retry_until
(
raise_on_failure:
true
)
do
Page
::
Main
::
Menu
.
perform
(
&
:sign_out_if_signed_in
)
!
Page
::
Main
::
Menu
.
perform
(
&
:signed_in?
)
end
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_admin_credentials
)
page
.
visit
Runtime
::
Scenario
.
gitlab_address
@group
.
visit!
Support
::
Retrier
.
retry_until
(
raise_on_failure:
true
)
do
Page
::
Main
::
Menu
.
perform
(
&
:sign_out_if_signed_in
)
!
Page
::
Main
::
Menu
.
perform
(
&
:signed_in?
)
end
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_admin_credentials
)
Page
::
Group
::
Menu
.
perform
(
&
:go_to_saml_sso_group_settings
)
EE
::
Page
::
Group
::
Settings
::
SamlSSO
.
perform
do
|
saml_sso
|
saml_sso
.
disable_enforce_sso
if
Runtime
::
Feature
.
enabled?
(
'enforced_sso'
)
saml_sso
.
disable_group_managed_accounts
if
Runtime
::
Feature
.
enabled?
(
'group_managed_accounts'
)
@group
.
visit!
saml_sso
.
click_save_changes
Page
::
Group
::
Menu
.
perform
(
&
:go_to_saml_sso_group_settings
)
EE
::
Page
::
Group
::
Settings
::
SamlSSO
.
perform
do
|
saml_sso
|
saml_sso
.
disable_enforce_sso
if
saml_sso
.
has_enforce_sso_button?
saml_sso
.
disable_group_managed_accounts
if
saml_sso
.
has_group_managed_accounts_button?
saml_sso
.
click_save_changes
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