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,7 +45,9 @@ module QA
               #
               puts 'Adding GitLab EE license ...'
 
-              Scenario::License::Add.perform(ENV['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
@@ -57,7 +55,9 @@ module QA
               #
               puts 'Enabling hashed repository storage setting ...'
 
-              QA::Scenario::Gitlab::Admin::HashedStorage.perform(:enabled)
+              QA::Runtime::Browser.visit(:geo_primary, QA::Page::Main::Login) do
+                QA::Scenario::Gitlab::Admin::HashedStorage.perform(:enabled)
+              end
             end
 
             def add_secondary_node
@@ -65,8 +65,10 @@ module QA
               #
               puts 'Adding new Geo secondary node ...'
 
-              Scenario::Geo::Node.perform do |node|
-                node.address = QA::Runtime::Scenario.geo_secondary_address
+              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
 

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']
 
-        EE::Scenario::License::Add.perform(ENV['EE_LICENSE'])
-      rescue
-        Capybara::Screenshot.screenshot_and_save_page
-        raise
+        QA::Runtime::Browser.visit(:gitlab, QA::Page::Main::Login) do
+          EE::Scenario::License::Add.perform(ENV['EE_LICENSE'])
+        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) }
-      Page::Main::Login.act { sign_in_using_credentials }
+      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|
-        scenario.name = 'geo-project'
-        scenario.description = 'Geo test project'
-      end
+        Scenario::Gitlab::Project::Create.perform do |scenario|
+          scenario.name = 'geo-project'
+          scenario.description = 'Geo test project'
+        end
 
-      geo_project_name = Page::Project::Show.act { project_name }
-      expect(geo_project_name).to include 'geo-project'
+        geo_project_name = Page::Project::Show.act { project_name }
+        expect(geo_project_name).to include 'geo-project'
 
-      Git::Repository.perform do |repository|
-        repository.location = Page::Project::Show.act do
-          choose_repository_clone_http
-          repository_location
-        end
+        Git::Repository.perform do |repository|
+          repository.location = Page::Project::Show.act do
+            choose_repository_clone_http
+            repository_location
+          end
 
-        repository.use_default_credentials
+          repository.use_default_credentials
 
-        repository.act do
-          clone
-          configure_identity('GitLab QA', 'root@gitlab.com')
-          add_file('README.md', '# This is Geo project!')
-          commit('Add README.md')
-          push_changes
+          repository.act do
+            clone
+            configure_identity('GitLab QA', 'root@gitlab.com')
+            add_file('README.md', '# This is Geo project!')
+            commit('Add README.md')
+            push_changes
+          end
         end
-      end
 
-      Page::Main::Entry.act { visit(Runtime::Scenario.geo_secondary_address) }
 
-      Page::Main::OAuth.act do
-        authorize! if needs_authorization?
-      end
+        Runtime::Browser.visit(:geo_secondary, QA::Page::Main::Login) do
+          Page::Main::OAuth.act do
+            authorize! if needs_authorization?
+          end
 
-      expect(page).to have_content 'You are on a secondary (read-only) Geo node'
+          expect(page).to have_content 'You are on a secondary (read-only) Geo node'
 
-      Page::Main::Menu.perform do |menu|
-        menu.go_to_projects
+          Page::Main::Menu.perform do |menu|
+            menu.go_to_projects
 
-        expect(page).to have_content(geo_project_name)
-      end
+            expect(page).to have_content(geo_project_name)
+          end
 
-      sleep 10 # wait for repository replication
+          sleep 10 # wait for repository replication
 
-      Page::Dashboard::Projects.perform do |dashboard|
-        dashboard.go_to_project(geo_project_name)
-      end
+          Page::Dashboard::Projects.perform do |dashboard|
+            dashboard.go_to_project(geo_project_name)
+          end
 
-      Page::Project::Show.perform do
-        expect(page).to have_content 'README.md'
-        expect(page).to have_content 'This is Geo project!'
+          Page::Project::Show.perform do
+            expect(page).to have_content 'README.md'
+            expect(page).to have_content 'This is Geo project!'
+          end
+        end
       end
     end
   end