Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 24 deletions

diff --git a/spec/helpers/nav/new_dropdown_helper_spec.rb b/spec/helpers/nav/new_dropdown_helper_spec.rb
index dd860ce3180..e3d9bc5b174 100644
--- a/spec/helpers/nav/new_dropdown_helper_spec.rb
+++ b/spec/helpers/nav/new_dropdown_helper_spec.rb
@@ -13,7 +13,6 @@ RSpec.describe Nav::NewDropdownHelper do
     let(:with_can_create_project) { false }
     let(:with_can_create_group) { false }
     let(:with_can_create_snippet) { false }
-    let(:with_new_repo_experiment) { :control }
     let(:with_invite_members_experiment) { false }
     let(:with_invite_members_experiment_enabled) { false }
 
@@ -29,7 +28,6 @@ RSpec.describe Nav::NewDropdownHelper do
     end
 
     before do
-      stub_experiments(new_repo: with_new_repo_experiment)
       allow(::Gitlab::Experimentation).to receive(:active?).with(:invite_members_new_dropdown) { with_invite_members_experiment }
       allow(helper).to receive(:experiment_enabled?).with(:invite_members_new_dropdown) { with_invite_members_experiment_enabled }
       allow(helper).to receive(:tracking_label) { 'test_tracking_label' }
@@ -43,19 +41,6 @@ RSpec.describe Nav::NewDropdownHelper do
       allow(user).to receive(:can?).with(:create_snippet) { with_can_create_snippet }
     end
 
-    shared_examples 'new repo experiment shared example' do |title|
-      let(:with_new_repo_experiment) { :candidate }
-
-      it 'has experiment project title' do
-        expect(subject[:menu_sections]).to match(
-          expected_menu_section(
-            title: title,
-            menu_item: a_hash_including(title: 'New project/repository')
-          )
-        )
-      end
-    end
-
     shared_examples 'invite member link shared example' do
       it 'shows invite member link' do
         expect(subject[:menu_sections]).to eq(
@@ -117,15 +102,13 @@ RSpec.describe Nav::NewDropdownHelper do
               title: 'GitLab',
               menu_item: ::Gitlab::Nav::TopNavMenuItem.build(
                 id: 'general_new_project',
-                title: 'New project',
+                title: 'New project/repository',
                 href: '/projects/new',
-                data: { track_experiment: 'new_repo', track_event: 'click_link_new_project', track_label: 'plus_menu_dropdown', qa_selector: 'global_new_project_link' }
+                data: { track_event: 'click_link_new_project', track_label: 'plus_menu_dropdown', qa_selector: 'global_new_project_link' }
               )
             )
           )
         end
-
-        it_behaves_like 'new repo experiment shared example', 'GitLab'
       end
 
       context 'when can create group' do
@@ -193,15 +176,13 @@ RSpec.describe Nav::NewDropdownHelper do
               title: 'This group',
               menu_item: ::Gitlab::Nav::TopNavMenuItem.build(
                 id: 'new_project',
-                title: 'New project',
+                title: 'New project/repository',
                 href: "/projects/new?namespace_id=#{group.id}",
-                data: { track_experiment: 'new_repo', track_event: 'click_link_new_project_group', track_label: 'plus_menu_dropdown' }
+                data: { track_event: 'click_link_new_project_group', track_label: 'plus_menu_dropdown' }
               )
             )
           )
         end
-
-        it_behaves_like 'new repo experiment shared example', 'This group'
       end
 
       context 'when can create subgroup' do
diff --git a/spec/helpers/nav/top_nav_helper_spec.rb b/spec/helpers/nav/top_nav_helper_spec.rb
index 466068b7b41..4d6da258536 100644
--- a/spec/helpers/nav/top_nav_helper_spec.rb
+++ b/spec/helpers/nav/top_nav_helper_spec.rb
@@ -143,7 +143,6 @@ RSpec.describe Nav::TopNavHelper do
             css_class: 'qa-projects-dropdown',
             data: {
               track_event: 'click_dropdown',
-              track_experiment: 'new_repo',
               track_label: 'projects_dropdown'
             },
             icon: 'project',