Merge branch 'nightly-25-fix-broken-saml-test' into 'master'

Fix SAML test failure due to random run order of specs

See merge request gitlab-org/gitlab-ee!7979

qa/qa/runtime/browser.rb

 require 'rspec/core'
+require 'rspec/expectations'
 require 'capybara/rspec'
 require 'capybara-screenshot/rspec'
 require 'selenium-webdriver'

qa/qa/specs/features/browser_ui/1_manage/ee_group/group_saml_sso_spec.rb

@@ -23,9 +23,7 @@ module QA
 
         EE::Page::Group::SamlSSOSignIn.act { click_signin }
 
-        Vendor::SAMLIdp::Page::Login.act { login }
-
-        expect(page).to have_content("SAML for #{Runtime::Env.sandbox_name} was added to your connected accounts")
+        login_to_idp_if_required_and_expect_success
 
         EE::Page::Group::Menu.act { go_to_saml_sso_group_settings }
 
@@ -47,10 +45,16 @@ module QA
           click_test_button
         end
 
-        Vendor::SAMLIdp::Page::Login.act { login }
+        login_to_idp_if_required_and_expect_success
 
         expect(page).to have_content("Test SAML SSO")
       end
     end
+
+    def login_to_idp_if_required_and_expect_success
+      Vendor::SAMLIdp::Page::Login.perform { |login_page| login_page.login_if_required }
+      expect(page).to have_content("SAML for #{Runtime::Env.sandbox_name} was added to your connected accounts")
+        .or have_content("Signed in with SAML for #{Runtime::Env.sandbox_name}")
+    end
   end
 end

qa/qa/specs/runner.rb

 require 'rspec/core'
+require 'rspec/expectations'
 
 module QA
   module Specs

qa/qa/vendor/saml_idp/page/login.rb

@@ -12,6 +12,14 @@ module QA
             fill_in 'password', with: 'user1pass'
             click_on 'Login'
           end
+
+          def login_if_required
+            login if login_required?
+          end
+
+          def login_required?
+            page.has_text?('Enter your username and password')
+          end
         end
       end
     end