Add latest changes from gitlab-org/gitlab@master

1 files changed, 27 insertions, 8 deletions

diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb
index c619bd6d6a3..61047c42fcc 100644
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
@@ -7,6 +7,14 @@ module QA
         include Page::Component::ClonePanel
         include Page::Project::SubMenus::Settings
 
+        view 'app/assets/javascripts/repository/components/table/row.vue' do
+          element :file_name_link
+        end
+
+        view 'app/assets/javascripts/repository/components/table/index.vue' do
+          element :file_tree_table
+        end
+
         view 'app/views/layouts/header/_new_dropdown.haml' do
           element :new_menu_toggle
           element :new_issue_link, "link_to _('New issue'), new_project_issue_path(@project)" # rubocop:disable QA/ElementWithPattern
@@ -17,7 +25,8 @@ module QA
         end
 
         view 'app/views/projects/_home_panel.html.haml' do
-          element :project_name
+          element :forked_from_link
+          element :project_name_content
         end
 
         view 'app/views/projects/_files.html.haml' do
@@ -37,10 +46,6 @@ module QA
           element :quick_actions
         end
 
-        view 'app/views/projects/tree/_tree_content.html.haml' do
-          element :file_tree
-        end
-
         view 'app/views/projects/tree/_tree_header.html.haml' do
           element :add_to_tree
           element :new_file_option
@@ -79,14 +84,18 @@ module QA
           click_on 'Fork'
         end
 
+        def forked_from?(parent_project_name)
+          has_element?(:forked_from_link, text: parent_project_name)
+        end
+
         def click_file(filename)
-          within_element(:file_tree) do
+          within_element(:file_tree_table) do
             click_on filename
           end
         end
 
         def click_commit(commit_msg)
-          within_element(:file_tree) do
+          within_element(:file_tree_table) do
             click_on commit_msg
           end
         end
@@ -96,6 +105,16 @@ module QA
           click_link 'New issue'
         end
 
+        def has_file?(name)
+          within_element(:file_tree_table) do
+            has_element?(:file_name_link, text: name)
+          end
+        end
+
+        def has_name?(name)
+          has_element?(:project_name_content, text: name)
+        end
+
         def last_commit_content
           find_element(:commit_content).text
         end
@@ -113,7 +132,7 @@ module QA
         end
 
         def project_name
-          find('.qa-project-name').text
+          find_element(:project_name_content).text
         end
 
         def switch_to_branch(branch_name)