Use QA Runtime Browser in EE specific QA scenarios

qa/qa/ee/scenario/test/geo.rb

@@ -15,10 +15,6 @@ module QA
             QA::Specs::Config.act { configure_capybara! }
 
             unless args[:geo_skip_setup?]
-              # TODO, Factory::License -> gitlab-org/gitlab-qa#86
-              #
-              QA::Runtime::Scenario.define(:gitlab_address, args[:geo_primary_address])
-
               Geo::Primary.act do
                 add_license
                 enable_hashed_storage
@@ -49,26 +45,32 @@ module QA
               #
               puts 'Adding GitLab EE license ...'
 
+              QA::Runtime::Browser.visit(:geo_primary, QA::Page::Main::Login) do
                 Scenario::License::Add.perform(ENV['EE_LICENSE'])
               end
+            end
 
             def enable_hashed_storage
               # TODO, Factory::HashedStorage - gitlab-org/gitlab-qa#86
               #
               puts 'Enabling hashed repository storage setting ...'
 
+              QA::Runtime::Browser.visit(:geo_primary, QA::Page::Main::Login) do
                 QA::Scenario::Gitlab::Admin::HashedStorage.perform(:enabled)
               end
+            end
 
             def add_secondary_node
               # TODO, Factory::Geo::Node - gitlab-org/gitlab-qa#86
               #
               puts 'Adding new Geo secondary node ...'
 
+              QA::Runtime::Browser.visit(:geo_primary, QA::Page::Main::Login) do
                 Scenario::Geo::Node.perform do |node|
                   node.address = QA::Runtime::Scenario.geo_secondary_address
                 end
               end
+            end
 
             def set_replication_password
               puts 'Setting replication password on primary node ...'

qa/qa/ee/strategy.rb

@@ -7,18 +7,12 @@ module QA
         require 'qa/ee'
       end
 
-      ##
-      # TODO generic solution for screenshot in factories
-      #
-      # gitlab-org/gitlab-qa#86
-      #
       def perform_before_hooks
         return unless ENV['EE_LICENSE']
 
+        QA::Runtime::Browser.visit(:gitlab, QA::Page::Main::Login) do
           EE::Scenario::License::Add.perform(ENV['EE_LICENSE'])
-      rescue
-        Capybara::Screenshot.screenshot_and_save_page
-        raise
+        end
       end
     end
   end

qa/qa/specs/features/ee/geo/replication_spec.rb

 module QA
   feature 'GitLab Geo replication', :geo do
     scenario 'users pushes code to the primary node' do
-      Page::Main::Entry.act { visit(Runtime::Scenario.geo_primary_address) }
+      Runtime::Browser.visit(:geo_primary, QA::Page::Main::Login) do
         Page::Main::Login.act { sign_in_using_credentials }
 
         Scenario::Gitlab::Project::Create.perform do |scenario|
@@ -29,8 +29,8 @@ module QA
           end
         end
 
-      Page::Main::Entry.act { visit(Runtime::Scenario.geo_secondary_address) }
 
+        Runtime::Browser.visit(:geo_secondary, QA::Page::Main::Login) do
           Page::Main::OAuth.act do
             authorize! if needs_authorization?
           end
@@ -55,4 +55,6 @@ module QA
           end
         end
       end
+    end
+  end
 end