Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 7 deletions

diff --git a/qa/qa/page/project/operations/kubernetes/add_existing.rb b/qa/qa/page/project/operations/kubernetes/add_existing.rb
index 9f47841366e..c143b55d057 100644
--- a/qa/qa/page/project/operations/kubernetes/add_existing.rb
+++ b/qa/qa/page/project/operations/kubernetes/add_existing.rb
@@ -11,7 +11,7 @@ module QA
               element :api_url, 'url_field :api_url' # rubocop:disable QA/ElementWithPattern
               element :ca_certificate, 'text_area :ca_cert' # rubocop:disable QA/ElementWithPattern
               element :token, 'text_field :token' # rubocop:disable QA/ElementWithPattern
-              element :add_cluster_button, "submit s_('ClusterIntegration|Add Kubernetes cluster')" # rubocop:disable QA/ElementWithPattern
+              element :add_kubernetes_cluster_button
               element :rbac_checkbox
             end
 
@@ -32,7 +32,7 @@ module QA
             end
 
             def add_cluster!
-              click_on 'Add Kubernetes cluster'
+              click_element :add_kubernetes_cluster_button, Page::Project::Operations::Kubernetes::Show
             end
 
             def uncheck_rbac!
diff --git a/qa/qa/page/project/operations/kubernetes/show.rb b/qa/qa/page/project/operations/kubernetes/show.rb
index 3d3eebdbec9..b639f867593 100644
--- a/qa/qa/page/project/operations/kubernetes/show.rb
+++ b/qa/qa/page/project/operations/kubernetes/show.rb
@@ -11,14 +11,20 @@ module QA
             end
 
             view 'app/views/clusters/clusters/_form.html.haml' do
-              element :base_domain
-              element :save_domain
+              element :integration_status_toggle, required: true
+              element :base_domain_field, required: true
+              element :save_changes_button, required: true
+            end
+
+            view 'app/assets/javascripts/clusters/components/application_row.vue' do
+              element :install_button
+              element :uninstall_button
             end
 
             def install!(application_name)
               within_element(application_name) do
                 has_element?(:install_button, application: application_name, wait: 30)
-                click_on 'Install' # TODO replace with click_element
+                click_element :install_button
               end
             end
 
@@ -41,11 +47,11 @@ module QA
             end
 
             def set_domain(domain)
-              fill_element :base_domain, domain
+              fill_element :base_domain_field, domain
             end
 
             def save_domain
-              click_element :save_domain
+              click_element :save_changes_button, Page::Project::Operations::Kubernetes::Show
             end
           end
         end