Add latest changes from gitlab-org/gitlab@master

3 files changed, 17 insertions, 30 deletions

diff --git a/qa/qa/page/dashboard/snippet/new.rb b/qa/qa/page/dashboard/snippet/new.rb
index d1a194ba1db..28f1e868eb5 100644
--- a/qa/qa/page/dashboard/snippet/new.rb
+++ b/qa/qa/page/dashboard/snippet/new.rb
@@ -6,6 +6,7 @@ module QA
       module Snippet
         class New < Page::Base
           view 'app/assets/javascripts/snippets/components/edit.vue' do
+            element :snippet_title_field, required: true
             element :submit_button
           end
 
@@ -14,12 +15,8 @@ module QA
             element :description_placeholder, required: true
           end
 
-          view 'app/assets/javascripts/snippets/components/snippet_title.vue' do
-            element :snippet_title, required: true
-          end
-
           view 'app/assets/javascripts/snippets/components/snippet_blob_edit.vue' do
-            element :snippet_file_name
+            element :file_name_field
           end
 
           view 'app/views/shared/form_elements/_description.html.haml' do
@@ -29,8 +26,8 @@ module QA
           view 'app/views/shared/snippets/_form.html.haml' do
             element :snippet_description_field
             element :description_placeholder
-            element :snippet_title
-            element :snippet_file_name
+            element :snippet_title_field
+            element :file_name_field
             element :submit_button
           end
 
@@ -40,7 +37,7 @@ module QA
           end
 
           def fill_title(title)
-            fill_element :snippet_title, title
+            fill_element :snippet_title_field, title
           end
 
           def fill_description(description)
@@ -54,7 +51,7 @@ module QA
 
           def fill_file_name(name)
             finished_loading?
-            fill_element :snippet_file_name, name
+            fill_element :file_name_field, name
           end
 
           def fill_file_content(content)
diff --git a/qa/qa/page/dashboard/snippet/show.rb b/qa/qa/page/dashboard/snippet/show.rb
index 52fbf6fba73..9c9159624f7 100644
--- a/qa/qa/page/dashboard/snippet/show.rb
+++ b/qa/qa/page/dashboard/snippet/show.rb
@@ -6,29 +6,19 @@ module QA
       module Snippet
         class Show < Page::Base
           view 'app/assets/javascripts/snippets/components/snippet_description_view.vue' do
-            element :snippet_description_field
+            element :snippet_description_content
           end
 
           view 'app/assets/javascripts/snippets/components/snippet_title.vue' do
-            element :snippet_title, required: true
+            element :snippet_title_content, required: true
           end
 
-          view 'app/views/shared/snippets/_header.html.haml' do
-            element :snippet_title, required: true
-            element :snippet_description_field, required: true
-            element :snippet_box
-          end
-
-          view 'app/views/projects/blob/_header_content.html.haml' do
-            element :file_title_name
+          view 'app/assets/javascripts/snippets/components/snippet_header.vue' do
+            element :snippet_container
           end
 
           view 'app/assets/javascripts/blob/components/blob_header_filepath.vue' do
-            element :file_title_name
-          end
-
-          view 'app/views/shared/_file_highlight.html.haml' do
-            element :file_content
+            element :file_title_content
           end
 
           view 'app/assets/javascripts/vue_shared/components/blob_viewers/simple_viewer.vue' do
@@ -54,11 +44,11 @@ module QA
           end
 
           def has_snippet_title?(snippet_title)
-            has_element? :snippet_title, text: snippet_title
+            has_element? :snippet_title_content, text: snippet_title
           end
 
           def has_snippet_description?(snippet_description)
-            has_element? :snippet_description_field, text: snippet_description
+            has_element? :snippet_description_content, text: snippet_description
           end
 
           def has_no_snippet_description?
@@ -66,13 +56,13 @@ module QA
           end
 
           def has_visibility_type?(visibility_type)
-            within_element(:snippet_box) do
+            within_element(:snippet_container) do
               has_text?(visibility_type)
             end
           end
 
           def has_file_name?(file_name)
-            within_element(:file_title_name) do
+            within_element(:file_title_content) do
               has_text?(file_name)
             end
           end
diff --git a/qa/qa/page/project/fork/new.rb b/qa/qa/page/project/fork/new.rb
index 1a52c61551d..ce52e42e22b 100644
--- a/qa/qa/page/project/fork/new.rb
+++ b/qa/qa/page/project/fork/new.rb
@@ -6,11 +6,11 @@ module QA
       module Fork
         class New < Page::Base
           view 'app/views/projects/forks/_fork_button.html.haml' do
-            element :namespace, 'link_to project_forks_path' # rubocop:disable QA/ElementWithPattern
+            element :fork_namespace_content
           end
 
           def choose_namespace(namespace = Runtime::Namespace.path)
-            click_on namespace
+            click_element(:fork_namespace_content)
           end
         end
       end