Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

2 files changed, 11 insertions, 1 deletions

diff --git a/spec/frontend/packages/details/components/package_title_spec.js b/spec/frontend/packages/details/components/package_title_spec.js
index d0ed78418af..61c6e824ab7 100644
--- a/spec/frontend/packages/details/components/package_title_spec.js
+++ b/spec/frontend/packages/details/components/package_title_spec.js
@@ -1,5 +1,6 @@
 import Vuex from 'vuex';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
+import { GlBreakpointInstance } from '@gitlab/ui/dist/utils';
 import PackageTitle from '~/packages/details/components/package_title.vue';
 import PackageTags from '~/packages/shared/components/package_tags.vue';
 import TitleArea from '~/vue_shared/components/registry/title_area.vue';
@@ -53,6 +54,7 @@ describe('PackageTitle', () => {
   const pipelineProject = () => wrapper.find('[data-testid="pipeline-project"]');
   const packageRef = () => wrapper.find('[data-testid="package-ref"]');
   const packageTags = () => wrapper.find(PackageTags);
+  const packageBadges = () => wrapper.findAll('[data-testid="tag-badge"]');
 
   afterEach(() => {
     wrapper.destroy();
@@ -70,6 +72,14 @@ describe('PackageTitle', () => {
 
       expect(wrapper.element).toMatchSnapshot();
     });
+
+    it('with tags on mobile', async () => {
+      jest.spyOn(GlBreakpointInstance, 'isDesktop').mockReturnValue(false);
+      await createComponent({ packageEntity: { ...mavenPackage, tags: mockTags } });
+      await wrapper.vm.$nextTick();
+
+      expect(packageBadges()).toHaveLength(mockTags.length);
+    });
   });
 
   describe('package title', () => {
diff --git a/spec/frontend/packages/list/components/__snapshots__/packages_list_app_spec.js.snap b/spec/frontend/packages/list/components/__snapshots__/packages_list_app_spec.js.snap
index ce3a58c856d..d27038e765f 100644
--- a/spec/frontend/packages/list/components/__snapshots__/packages_list_app_spec.js.snap
+++ b/spec/frontend/packages/list/components/__snapshots__/packages_list_app_spec.js.snap
@@ -10,7 +10,7 @@ exports[`packages_list_app renders 1`] = `
     activenavitemclass="gl-tab-nav-item-active gl-tab-nav-item-active-indigo"
     class="gl-tabs"
     contentclass=",gl-tab-content"
-    navclass="gl-tabs-nav"
+    navclass=",gl-tabs-nav"
     nofade="true"
     nonavstyle="true"
     tag="div"