Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 2 deletions

diff --git a/qa/qa/page/dashboard/snippet/index.rb b/qa/qa/page/dashboard/snippet/index.rb
index 63589c376f6..d8314509b1f 100644
--- a/qa/qa/page/dashboard/snippet/index.rb
+++ b/qa/qa/page/dashboard/snippet/index.rb
@@ -7,6 +7,9 @@ module QA
         class Index < Page::Base
           view 'app/views/layouts/header/_new_dropdown.html.haml' do
             element :new_menu_toggle
+          end
+
+          view 'app/helpers/nav/new_dropdown_helper.rb' do
             element :global_new_snippet_link
           end
 
diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb
index c174d4b0c3f..6e5097c3812 100644
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
@@ -24,7 +24,10 @@ module QA
 
         view 'app/views/layouts/header/_new_dropdown.html.haml' do
           element :new_menu_toggle
-          element :new_issue_link, "link_to _('New issue'), new_project_issue_path(@project)" # rubocop:disable QA/ElementWithPattern
+        end
+
+        view 'app/helpers/nav/new_dropdown_helper.rb' do
+          element :new_issue_link
         end
 
         view 'app/views/projects/_last_push.html.haml' do
@@ -115,7 +118,7 @@ module QA
 
         def go_to_new_issue
           click_element :new_menu_toggle
-          click_link 'New issue'
+          click_element(:new_issue_link)
         end
 
         def has_file?(name)