Add latest changes from gitlab-org/gitlab@master

2 files changed, 49 insertions, 10 deletions

diff --git a/spec/helpers/nav/new_dropdown_helper_spec.rb b/spec/helpers/nav/new_dropdown_helper_spec.rb
index b325a0ba228..2a69f8a56b3 100644
--- a/spec/helpers/nav/new_dropdown_helper_spec.rb
+++ b/spec/helpers/nav/new_dropdown_helper_spec.rb
@@ -46,7 +46,8 @@ RSpec.describe Nav::NewDropdownHelper do
               href: expected_href,
               data: {
                 track_action: 'click_link_invite_members',
-                track_label: 'plus_menu_dropdown'
+                track_label: 'plus_menu_dropdown',
+                track_property: 'navigation_top'
               }
             )
           )
@@ -82,7 +83,12 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'general_new_project',
                 title: 'New project/repository',
                 href: '/projects/new',
-                data: { track_action: 'click_link_new_project', track_label: 'plus_menu_dropdown', qa_selector: 'global_new_project_link' }
+                data: {
+                  track_action: 'click_link_new_project',
+                  track_label: 'plus_menu_dropdown',
+                  track_property: 'navigation_top',
+                  qa_selector: 'global_new_project_link'
+                }
               )
             )
           )
@@ -100,7 +106,12 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'general_new_group',
                 title: 'New group',
                 href: '/groups/new',
-                data: { qa_selector: 'global_new_group_link', track_action: 'click_link_new_group', track_label: 'plus_menu_dropdown' }
+                data: {
+                  track_action: 'click_link_new_group',
+                  track_label: 'plus_menu_dropdown',
+                  track_property: 'navigation_top',
+                  qa_selector: 'global_new_group_link'
+                }
               )
             )
           )
@@ -118,7 +129,12 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'general_new_snippet',
                 title: 'New snippet',
                 href: '/-/snippets/new',
-                data: { track_action: 'click_link_new_snippet_parent', track_label: 'plus_menu_dropdown', qa_selector: 'global_new_snippet_link' }
+                data: {
+                  track_action: 'click_link_new_snippet_parent',
+                  track_label: 'plus_menu_dropdown',
+                  track_property: 'navigation_top',
+                  qa_selector: 'global_new_snippet_link'
+                }
               )
             )
           )
@@ -156,7 +172,11 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'new_project',
                 title: 'New project/repository',
                 href: "/projects/new?namespace_id=#{group.id}",
-                data: { track_action: 'click_link_new_project_group', track_label: 'plus_menu_dropdown' }
+                data: {
+                  track_action: 'click_link_new_project_group',
+                  track_label: 'plus_menu_dropdown',
+                  track_property: 'navigation_top'
+                }
               )
             )
           )
@@ -174,7 +194,11 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'new_subgroup',
                 title: 'New subgroup',
                 href: "/groups/new?parent_id=#{group.id}#create-group-pane",
-                data: { track_action: 'click_link_new_subgroup', track_label: 'plus_menu_dropdown' }
+                data: {
+                  track_action: 'click_link_new_subgroup',
+                  track_label: 'plus_menu_dropdown',
+                  track_property: 'navigation_top'
+                }
               )
             )
           )
@@ -223,7 +247,12 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'new_issue',
                 title: 'New issue',
                 href: "/#{project.path_with_namespace}/-/issues/new",
-                data: { track_action: 'click_link_new_issue', track_label: 'plus_menu_dropdown', qa_selector: 'new_issue_link' }
+                data: {
+                  track_action: 'click_link_new_issue',
+                  track_label: 'plus_menu_dropdown',
+                  track_property: 'navigation_top',
+                  qa_selector: 'new_issue_link'
+                }
               )
             )
           )
@@ -241,7 +270,11 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'new_mr',
                 title: 'New merge request',
                 href: "/#{merge_project.path_with_namespace}/-/merge_requests/new",
-                data: { track_action: 'click_link_new_mr', track_label: 'plus_menu_dropdown' }
+                data: {
+                  track_action: 'click_link_new_mr',
+                  track_label: 'plus_menu_dropdown',
+                  track_property: 'navigation_top'
+                }
               )
             )
           )
@@ -259,7 +292,11 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'new_snippet',
                 title: 'New snippet',
                 href: "/#{project.path_with_namespace}/-/snippets/new",
-                data: { track_action: 'click_link_new_snippet_project', track_label: 'plus_menu_dropdown' }
+                data: {
+                  track_action: 'click_link_new_snippet_project',
+                  track_label: 'plus_menu_dropdown',
+                  track_property: 'navigation_top'
+                }
               )
             )
           )
diff --git a/spec/helpers/nav/top_nav_helper_spec.rb b/spec/helpers/nav/top_nav_helper_spec.rb
index c4a8536032e..ce5ac2e5404 100644
--- a/spec/helpers/nav/top_nav_helper_spec.rb
+++ b/spec/helpers/nav/top_nav_helper_spec.rb
@@ -125,6 +125,7 @@ RSpec.describe Nav::TopNavHelper do
             data: {
               track_action: 'click_dropdown',
               track_label: 'projects_dropdown',
+              track_property: 'navigation_top',
               qa_selector: 'projects_dropdown'
             },
             icon: 'project',
@@ -222,6 +223,7 @@ RSpec.describe Nav::TopNavHelper do
             data: {
               track_action: 'click_dropdown',
               track_label: 'groups_dropdown',
+              track_property: 'navigation_top',
               qa_selector: 'groups_dropdown'
             },
             icon: 'group',
@@ -517,7 +519,7 @@ RSpec.describe Nav::TopNavHelper do
     {
       track_label: "menu_#{label}",
       track_action: 'click_dropdown',
-      track_property: 'navigation'
+      track_property: 'navigation_top'
     }
   end
 end