From e5e57df61ccda241e23bd4f67fe9022cec6c8c57 Mon Sep 17 00:00:00 2001 From: Mark Lapierre Date: Thu, 14 Feb 2019 12:06:39 -0500 Subject: Move server responding check to scenario before hook This checks that the server is responding before any other actions, including before trying to add a license. --- qa/spec/spec_helper.rb | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'qa/spec') diff --git a/qa/spec/spec_helper.rb b/qa/spec/spec_helper.rb index f1b4203d422..20a153f3f63 100644 --- a/qa/spec/spec_helper.rb +++ b/qa/spec/spec_helper.rb @@ -5,20 +5,6 @@ require_relative '../qa' end RSpec.configure do |config| - ServerNotRespondingError = Class.new(RuntimeError) - - # The login page could take some time to load the first time it is visited. - # We visit the login page and wait for it to properly load only once at the beginning of the suite. - config.before(:suite) do - if QA::Runtime::Scenario.respond_to?(:gitlab_address) - QA::Runtime::Browser.visit(:gitlab, QA::Page::Main::Login) - - unless QA::Page::Main::Login.perform(&:page_loaded?) - raise ServerNotRespondingError, "Login page did not load at #{QA::Page::Main::Login.perform(&:current_url)}" - end - end - end - config.before(:context) do if self.class.metadata.keys.include?(:quarantine) skip_or_run_quarantined_tests(self.class.metadata.keys, config.inclusion_filter.rules.keys) -- cgit v1.2.1