1 files changed, 30 insertions, 8 deletions
diff --git a/qa/qa/page/profile/personal_access_tokens.rb b/qa/qa/page/profile/personal_access_tokens.rb
index 9191dbe9cf3..8c12eff5cf1 100644
--- a/qa/qa/page/profile/personal_access_tokens.rb
+++ b/qa/qa/page/profile/personal_access_tokens.rb
@@ -3,29 +3,51 @@ module QA
     module Profile
       class PersonalAccessTokens < Page::Base
         view 'app/views/shared/_personal_access_tokens_form.html.haml' do
-          element :personal_access_token_name_field, 'text_field :name' # rubocop:disable QA/ElementWithPattern
-          element :create_token_button, 'submit "Create #{type} token"' # rubocop:disable QA/ElementWithPattern, Lint/InterpolationCheck
-          element :scopes_api_radios, "label :scopes" # rubocop:disable QA/ElementWithPattern
+          element :personal_access_token_name_field
+          element :create_token_button
+        end
+
+        view 'app/views/shared/tokens/_scopes_form.html.haml' do
+          element :api_radio, 'qa-#{scope}-radio' # rubocop:disable QA/ElementWithPattern, Lint/InterpolationCheck
         end
 
         view 'app/views/shared/_personal_access_tokens_created_container.html.haml' do
-          element :create_token_field, "text_field_tag 'created-personal-access-token'" # rubocop:disable QA/ElementWithPattern
+          element :created_personal_access_token
+        end
+        view 'app/views/shared/_personal_access_tokens_table.html.haml' do
+          element :revoke_button
         end
 
         def fill_token_name(name)
-          fill_in 'personal_access_token_name', with: name
+          fill_element(:personal_access_token_name_field, name)
         end
 
         def check_api
-          check 'personal_access_token_scopes_api'
+          check_element(:api_radio)
         end
 
         def create_token
-          click_on 'Create personal access token'
+          click_element(:create_token_button)
         end
 
         def created_access_token
-          page.find('#created-personal-access-token').value
+          find_element(:created_personal_access_token, wait: 30).value
+        end
+
+        def has_token_row_for_name?(token_name)
+          page.has_css?('tr', text: token_name, wait: 1.0)
+        end
+
+        def first_token_row_for_name(token_name)
+          page.find('tr', text: token_name, match: :first, wait: 1.0)
+        end
+
+        def revoke_first_token_with_name(token_name)
+          within first_token_row_for_name(token_name) do
+            accept_confirm do
+              click_element(:revoke_button)
+            end
+          end
         end
       end
     end