Merge branch '35010-remove-goto-project-from-breadcrumb' into 'master'

Remove project select dropdown from breadcrumb

Closes #35010

See merge request !14010

3 files changed, 2 insertions, 104 deletions

diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index baf3d29e6c5..81f7ab80a04 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -95,49 +95,6 @@ feature 'Project' do
     end
   end
 
-  describe 'project title' do
-    let(:user)    { create(:user) }
-    let(:project) { create(:project, namespace: user.namespace) }
-
-    before do
-      sign_in(user)
-      project.add_user(user, Gitlab::Access::MASTER)
-      visit project_path(project)
-    end
-
-    it 'clicks toggle and shows dropdown', js: true do
-      find('.js-projects-dropdown-toggle').click
-      expect(page).to have_css('.dropdown-menu-projects .dropdown-content li', count: 1)
-    end
-  end
-
-  describe 'project title' do
-    let(:user)    { create(:user) }
-    let(:project) { create(:project, namespace: user.namespace) }
-    let(:project2) { create(:project, namespace: user.namespace, path: 'test') }
-    let(:issue) { create(:issue, project: project) }
-
-    context 'on issues page', js: true do
-      before do
-        sign_in(user)
-        project.add_user(user, Gitlab::Access::MASTER)
-        project2.add_user(user, Gitlab::Access::MASTER)
-        visit project_issue_path(project, issue)
-      end
-
-      it 'clicks toggle and shows dropdown' do
-        find('.js-projects-dropdown-toggle').click
-        expect(page).to have_css('.dropdown-menu-projects .dropdown-content li', count: 2)
-
-        page.within '.dropdown-menu-projects' do
-          click_link project.name_with_namespace
-        end
-
-        expect(page).to have_content project.name
-      end
-    end
-  end
-
   describe 'tree view (default view is set to Files)' do
     let(:user) { create(:user, project_view: 'files') }
     let(:project) { create(:forked_project_with_submodules) }
diff --git a/spec/javascripts/project_title_spec.js b/spec/javascripts/project_title_spec.js
deleted file mode 100644
index 9ea8414ae40..00000000000
--- a/spec/javascripts/project_title_spec.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/* global Project */
-
-import 'select2/select2';
-import '~/gl_dropdown';
-import '~/api';
-import '~/project_select';
-import '~/project';
-
-describe('Project Title', () => {
-  const dummyApiVersion = 'v3000';
-  preloadFixtures('issues/open-issue.html.raw');
-  loadJSONFixtures('projects.json');
-
-  beforeEach(() => {
-    loadFixtures('issues/open-issue.html.raw');
-
-    window.gon = {};
-    window.gon.api_version = dummyApiVersion;
-
-    // eslint-disable-next-line no-new
-    new Project();
-  });
-
-  describe('project list', () => {
-    let reqUrl;
-    let reqData;
-
-    beforeEach(() => {
-      const fakeResponseData = getJSONFixture('projects.json');
-      spyOn(jQuery, 'ajax').and.callFake((req) => {
-        const def = $.Deferred();
-        reqUrl = req.url;
-        reqData = req.data;
-        def.resolve(fakeResponseData);
-        return def.promise();
-      });
-    });
-
-    it('toggles dropdown', () => {
-      const $menu = $('.js-dropdown-menu-projects');
-      window.gon.current_user_id = 1;
-      $('.js-projects-dropdown-toggle').click();
-      expect($menu).toHaveClass('open');
-      expect(reqUrl).toBe(`/api/${dummyApiVersion}/projects.json`);
-      expect(reqData).toEqual({
-        search: '',
-        order_by: 'last_activity_at',
-        per_page: 20,
-        membership: true,
-        simple: true,
-      });
-      $menu.find('.dropdown-menu-close-icon').click();
-      expect($menu).not.toHaveClass('open');
-    });
-  });
-
-  afterEach(() => {
-    window.gon = {};
-  });
-});
diff --git a/spec/javascripts/projects_dropdown/service/projects_service_spec.js b/spec/javascripts/projects_dropdown/service/projects_service_spec.js
index e9aabfaec1f..d5dd8b3449a 100644
--- a/spec/javascripts/projects_dropdown/service/projects_service_spec.js
+++ b/spec/javascripts/projects_dropdown/service/projects_service_spec.js
@@ -15,6 +15,7 @@ describe('ProjectsService', () => {
 
   beforeEach(() => {
     gon.api_version = currentSession.apiVersion;
+    gon.current_user_id = 1;
     service = new ProjectsService(currentSession.username);
   });
 
@@ -35,7 +36,7 @@ describe('ProjectsService', () => {
       const queryParams = {
         simple: false,
         per_page: 20,
-        membership: false,
+        membership: true,
         order_by: 'last_activity_at',
         search: searchQuery,
       };