Commit 3f474171 authored by Sanad Liaquat's avatar Sanad Liaquat

Merge branch 'qa-shl-enable-feature-flags-in-group-saml-sso-specs' into 'master'

Enable admin nav feature flag in SAML SSO specs

Closes #213930

See merge request gitlab-org/gitlab!29247
parents 2b455019 9c7dd9fd
...@@ -51,7 +51,7 @@ module QA ...@@ -51,7 +51,7 @@ module QA
after do after do
page.visit Runtime::Scenario.gitlab_address page.visit Runtime::Scenario.gitlab_address
%w[enforced_sso enforced_sso_requires_session].each do |flag| %w[enforced_sso enforced_sso_requires_session group_administration_nav_item].each do |flag|
Runtime::Feature.remove(flag) Runtime::Feature.remove(flag)
end end
...@@ -64,7 +64,7 @@ module QA ...@@ -64,7 +64,7 @@ module QA
end end
def setup_and_enable_enforce_sso def setup_and_enable_enforce_sso
%w[enforced_sso enforced_sso_requires_session].each do |flag| %w[enforced_sso enforced_sso_requires_session group_administration_nav_item].each do |flag|
Runtime::Feature.enable_and_verify(flag) Runtime::Feature.enable_and_verify(flag)
end end
......
...@@ -85,7 +85,7 @@ module QA ...@@ -85,7 +85,7 @@ module QA
after(:all) do after(:all) do
page.visit Runtime::Scenario.gitlab_address page.visit Runtime::Scenario.gitlab_address
%w[enforced_sso enforced_sso_requires_session group_managed_accounts sign_up_on_sso group_scim].each do |flag| %w[enforced_sso enforced_sso_requires_session group_managed_accounts sign_up_on_sso group_scim group_administration_nav_item].each do |flag|
Runtime::Feature.remove(flag) Runtime::Feature.remove(flag)
end end
...@@ -119,7 +119,7 @@ module QA ...@@ -119,7 +119,7 @@ module QA
end end
def setup_and_enable_group_managed_accounts def setup_and_enable_group_managed_accounts
%w[enforced_sso enforced_sso_requires_session group_managed_accounts sign_up_on_sso group_scim].each do |flag| %w[enforced_sso enforced_sso_requires_session group_managed_accounts sign_up_on_sso group_scim group_administration_nav_item].each do |flag|
Runtime::Feature.enable_and_verify(flag) Runtime::Feature.enable_and_verify(flag)
end end
......
...@@ -10,6 +10,8 @@ module QA ...@@ -10,6 +10,8 @@ module QA
sandbox_group.path = "saml_sso_group_#{SecureRandom.hex(8)}" sandbox_group.path = "saml_sso_group_#{SecureRandom.hex(8)}"
end end
Runtime::Feature.enable_and_verify('group_administration_nav_item')
@saml_idp_service = Flow::Saml.run_saml_idp_service(@group.path) @saml_idp_service = Flow::Saml.run_saml_idp_service(@group.path)
end end
...@@ -73,6 +75,8 @@ module QA ...@@ -73,6 +75,8 @@ module QA
after(:all) do after(:all) do
@group.remove_via_api! @group.remove_via_api!
Runtime::Feature.remove('group_administration_nav_item')
page.visit Runtime::Scenario.gitlab_address page.visit Runtime::Scenario.gitlab_address
Page::Main::Menu.perform(&:sign_out_if_signed_in) Page::Main::Menu.perform(&:sign_out_if_signed_in)
......
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