Merge branch 'fix/qa/use-new-geo-nodes-settings-pages' into 'master'

Use new Geo nodes settings pages in Gitlab QA

Closes #4306

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

qa/qa/ee.rb

@@ -6,7 +6,13 @@ module QA
     module Page
       module Admin
         autoload :License, 'qa/ee/page/admin/license'
-        autoload :GeoNodes, 'qa/ee/page/admin/geo_nodes'
+
+        module Geo
+          module Nodes
+            autoload :Show, 'qa/ee/page/admin/geo/nodes/show'
+            autoload :New, 'qa/ee/page/admin/geo/nodes/new'
+          end
+        end
       end
     end
 

qa/qa/ee/page/admin/geo/nodes/new.rb

+module QA
+  module EE
+    module Page
+      module Admin
+        module Geo
+          module Nodes
+            class New < QA::Page::Base
+              def set_node_address(address)
+                fill_in 'URL', with: address
+              end
+
+              def add_node!
+                click_button 'Add Node'
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

qa/qa/ee/page/admin/geo_nodes.rb → qa/qa/ee/page/admin/geo/nodes/show.rb

@@ -2,13 +2,13 @@ module QA
   module EE
     module Page
       module Admin
-        class GeoNodes < QA::Page::Base
-          def set_node_address(address)
-            fill_in 'URL', with: address
-          end
-
-          def add_node!
-            click_button 'Add Node'
+        module Geo
+          module Nodes
+            class Show < QA::Page::Base
+              def new_node!
+                click_link 'New node'
+              end
+            end
           end
         end
       end

qa/qa/ee/scenario/geo/node.rb

@@ -10,8 +10,9 @@ module QA
             QA::Page::Main::Login.act { sign_in_using_credentials }
             QA::Page::Main::Menu.act { go_to_admin_area }
             QA::Page::Admin::Menu.act { go_to_geo_nodes }
+            EE::Page::Admin::Geo::Nodes::Show.act { new_node! }
 
-            EE::Page::Admin::GeoNodes.perform do |page|
+            EE::Page::Admin::Geo::Nodes::New.perform do |page|
               raise ArgumentError if @address.nil?
 
               page.set_node_address(@address)