Add latest changes from gitlab-org/gitlab@master

3 files changed, 28 insertions, 28 deletions

diff --git a/qa/gdk/Dockerfile.gdk b/qa/gdk/Dockerfile.gdk
index b3443049875..f55b10e62d9 100644
--- a/qa/gdk/Dockerfile.gdk
+++ b/qa/gdk/Dockerfile.gdk
@@ -5,7 +5,7 @@ ENV GITLAB_LICENSE_MODE=test \
 
 # Clone GDK at specific sha and bootstrap packages
 #
-ARG GDK_SHA=221d3cc81d3ffc17beb178fd5021cd0d93ca55b6
+ARG GDK_SHA=88c3231079278a49ba59d37362357e5908fb7179
 RUN set -eux; \
     git clone --depth 1 https://gitlab.com/gitlab-org/gitlab-development-kit.git && cd gitlab-development-kit; \
     git fetch --depth 1 origin ${GDK_SHA} && git -c advice.detachedHead=false checkout ${GDK_SHA}; \
diff --git a/qa/qa/page/profile/emails.rb b/qa/qa/page/profile/emails.rb
index 1e6b7518e55..f9340445276 100644
--- a/qa/qa/page/profile/emails.rb
+++ b/qa/qa/page/profile/emails.rb
@@ -7,27 +7,27 @@ module QA
         include QA::Page::Component::ConfirmModal
 
         view 'app/views/profiles/emails/index.html.haml' do
-          element :email_address_field
-          element :add_email_address_button
-          element :email_row_content
-          element :delete_email_link
-          element :toggle_email_address_field
+          element 'email-address-field'
+          element 'add-email-address-button'
+          element 'email-row-content'
+          element 'delete-email-link'
+          element 'toggle-email-address-field'
         end
 
         def expand_email_input
-          click_element(:toggle_email_address_field) if has_no_element?(:email_address_field)
-          has_element?(:email_address_field)
+          click_element('toggle-email-address-field') if has_no_element?('email-address-field')
+          has_element?('email-address-field')
         end
 
         def add_email_address(email_address)
           expand_email_input
-          find_element(:email_address_field).set email_address
-          click_element(:add_email_address_button)
+          find_element('email-address-field').set email_address
+          click_element('add-email-address-button')
         end
 
         def delete_email_address(email_address)
-          within_element(:email_row_content, text: email_address) do
-            click_element(:delete_email_link)
+          within_element('email-row-content', text: email_address) do
+            click_element('delete-email-link')
           end
           click_confirmation_ok_button
         end
diff --git a/qa/qa/page/profile/password.rb b/qa/qa/page/profile/password.rb
index 5f07cdb6f25..d70dcbabd49 100644
--- a/qa/qa/page/profile/password.rb
+++ b/qa/qa/page/profile/password.rb
@@ -5,31 +5,31 @@ module QA
     module Profile
       class Password < Page::Base
         view 'app/views/user_settings/passwords/edit.html.haml' do
-          element :current_password_field
-          element :new_password_field
-          element :confirm_password_field
-          element :save_password_button
+          element 'current-password-field'
+          element 'new-password-field'
+          element 'confirm-password-field'
+          element 'save-password-button'
         end
 
         view 'app/views/user_settings/passwords/new.html.haml' do
-          element :current_password_field
-          element :new_password_field
-          element :confirm_password_field
-          element :set_new_password_button
+          element 'current-password-field'
+          element 'new-password-field'
+          element 'confirm-password-field'
+          element 'set-new-password-button'
         end
 
         def update_password(new_password, current_password)
-          find_element(:current_password_field).set current_password
-          find_element(:new_password_field).set new_password
-          find_element(:confirm_password_field).set new_password
-          click_element(:save_password_button)
+          find_element('current-password-field').set current_password
+          find_element('new-password-field').set new_password
+          find_element('confirm-password-field').set new_password
+          click_element('save-password-button')
         end
 
         def set_new_password(new_password, current_password)
-          fill_element :current_password_field, current_password
-          fill_element :new_password_field, new_password
-          fill_element :confirm_password_field, new_password
-          click_element :set_new_password_button
+          fill_element('current-password-field', current_password)
+          fill_element('new-password-field', new_password)
+          fill_element('confirm-password-field', new_password)
+          click_element('set-new-password-button')
         end
       end
     end