Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 43 deletions

diff --git a/spec/helpers/nav/new_dropdown_helper_spec.rb b/spec/helpers/nav/new_dropdown_helper_spec.rb
index 174a5a668a8..5ae057dc97d 100644
--- a/spec/helpers/nav/new_dropdown_helper_spec.rb
+++ b/spec/helpers/nav/new_dropdown_helper_spec.rb
@@ -11,11 +11,10 @@ RSpec.describe Nav::NewDropdownHelper, feature_category: :navigation do
     let(:with_can_create_project) { false }
     let(:with_can_create_group) { false }
     let(:with_can_create_snippet) { false }
-    let(:with_context) { true }
     let(:title) { 'Create new...' }
 
     subject(:view_model) do
-      helper.new_dropdown_view_model(project: current_project, group: current_group, with_context: with_context)
+      helper.new_dropdown_view_model(project: current_project, group: current_group)
     end
 
     before do
@@ -157,26 +156,12 @@ RSpec.describe Nav::NewDropdownHelper, feature_category: :navigation do
       it 'has base results' do
         results = {
           title: title,
-          menu_sections: [],
-          context: group
+          menu_sections: []
         }
 
         expect(view_model).to eq(results)
       end
 
-      context 'without context' do
-        let(:with_context) { false }
-
-        it 'has base results' do
-          results = {
-            title: title,
-            menu_sections: []
-          }
-
-          expect(view_model).to eq(results)
-        end
-      end
-
       context 'when can create projects in group' do
         let(:with_can_create_projects_in_group) { true }
 
@@ -247,29 +232,15 @@ RSpec.describe Nav::NewDropdownHelper, feature_category: :navigation do
         allow(helper).to receive(:can_admin_project_member?) { with_can_admin_project_member }
       end
 
-      it 'has base results with context' do
+      it 'has base results' do
         results = {
           title: title,
-          menu_sections: [],
-          context: project
+          menu_sections: []
         }
 
         expect(view_model).to eq(results)
       end
 
-      context 'without context' do
-        let(:with_context) { false }
-
-        it 'has base results without context' do
-          results = {
-            title: title,
-            menu_sections: []
-          }
-
-          expect(view_model).to eq(results)
-        end
-      end
-
       context 'with show_new_issue_link?' do
         let(:with_show_new_issue_link) { true }
 
@@ -375,20 +346,11 @@ RSpec.describe Nav::NewDropdownHelper, feature_category: :navigation do
         )
         results = {
           title: title,
-          menu_sections: project_section,
-          context: project
+          menu_sections: project_section
         }
 
         expect(view_model).to eq(results)
       end
-
-      context 'without context' do
-        let(:with_context) { false }
-
-        it 'does not include context' do
-          expect(view_model.keys).to match_array([:title, :menu_sections])
-        end
-      end
     end
 
     def expected_menu_section(title:, menu_item:)