Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 8 deletions

diff --git a/qa/qa/page/project/import/github.rb b/qa/qa/page/project/import/github.rb
index cc0c4e1e835..e73db92de42 100644
--- a/qa/qa/page/project/import/github.rb
+++ b/qa/qa/page/project/import/github.rb
@@ -8,8 +8,8 @@ module QA
           include Page::Component::Select2
 
           view 'app/views/import/github/new.html.haml' do
-            element :personal_access_token_field, 'text_field_tag :personal_access_token' # rubocop:disable QA/ElementWithPattern
-            element :authenticate_button, "submit_tag _('Authenticate')" # rubocop:disable QA/ElementWithPattern
+            element :personal_access_token_field
+            element :authenticate_button
           end
 
           view 'app/assets/javascripts/import_projects/components/provider_repo_table_row.vue' do
@@ -20,11 +20,9 @@ module QA
           end
 
           def add_personal_access_token(personal_access_token)
-            fill_in 'personal_access_token', with: personal_access_token
-          end
-
-          def list_repos
-            click_button 'List your GitHub repositories'
+            fill_element(:personal_access_token_field, personal_access_token)
+            click_element(:authenticate_button)
+            finished_loading?
           end
 
           def import!(full_path, name)
diff --git a/qa/qa/resource/project_imported_from_github.rb b/qa/qa/resource/project_imported_from_github.rb
index 3e25235e6b8..e5ecaeae139 100644
--- a/qa/qa/resource/project_imported_from_github.rb
+++ b/qa/qa/resource/project_imported_from_github.rb
@@ -23,7 +23,6 @@ module QA
 
         Page::Project::Import::Github.perform do |import_page|
           import_page.add_personal_access_token(@personal_access_token)
-          import_page.list_repos
           import_page.import!(@github_repository_path, @name)
         end
       end