Add latest changes from gitlab-org/gitlab@master

2 files changed, 46 insertions, 14 deletions

diff --git a/spec/frontend/ci/catalog/components/details/ci_resource_components_spec.js b/spec/frontend/ci/catalog/components/details/ci_resource_components_spec.js
index 0293cfec6f0..330163e9f39 100644
--- a/spec/frontend/ci/catalog/components/details/ci_resource_components_spec.js
+++ b/spec/frontend/ci/catalog/components/details/ci_resource_components_spec.js
@@ -2,7 +2,6 @@ import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import { GlEmptyState, GlLoadingIcon } from '@gitlab/ui';
 import { mountExtended } from 'helpers/vue_test_utils_helper';
-import { resolvers } from '~/ci/catalog/graphql/settings';
 import CiResourceComponents from '~/ci/catalog/components/details/ci_resource_components.vue';
 import getCiCatalogcomponentComponents from '~/ci/catalog/graphql/queries/get_ci_catalog_resource_components.query.graphql';
 import createMockApollo from 'helpers/mock_apollo_helper';
@@ -17,7 +16,7 @@ describe('CiResourceComponents', () => {
   let wrapper;
   let mockComponentsResponse;
 
-  const components = mockComponents.data.ciCatalogResource.components.nodes;
+  const components = mockComponents.data.ciCatalogResource.latestVersion.components.nodes;
 
   const resourcePath = 'twitter/project-1';
 
@@ -25,7 +24,7 @@ describe('CiResourceComponents', () => {
 
   const createComponent = async () => {
     const handlers = [[getCiCatalogcomponentComponents, mockComponentsResponse]];
-    const mockApollo = createMockApollo(handlers, resolvers);
+    const mockApollo = createMockApollo(handlers);
 
     wrapper = mountExtended(CiResourceComponents, {
       propsData: {
@@ -113,10 +112,9 @@ describe('CiResourceComponents', () => {
         expect(findComponents()).toHaveLength(components.length);
       });
 
-      it('renders the component name, description and snippet', () => {
+      it('renders the component name and snippet', () => {
         components.forEach((component) => {
           expect(wrapper.text()).toContain(component.name);
-          expect(wrapper.text()).toContain(component.description);
           expect(wrapper.text()).toContain(component.path);
         });
       });
@@ -134,9 +132,9 @@ describe('CiResourceComponents', () => {
         it('renders the component parameter attributes', () => {
           const [firstComponent] = components;
 
-          firstComponent.inputs.nodes.forEach((input) => {
+          firstComponent.inputs.forEach((input) => {
             expect(findComponents().at(0).text()).toContain(input.name);
-            expect(findComponents().at(0).text()).toContain(input.defaultValue);
+            expect(findComponents().at(0).text()).toContain(input.default);
             expect(findComponents().at(0).text()).toContain('Yes');
           });
         });
diff --git a/spec/frontend/ci/catalog/mock.js b/spec/frontend/ci/catalog/mock.js
index 2d5d198ebe1..e370ac5054f 100644
--- a/spec/frontend/ci/catalog/mock.js
+++ b/spec/frontend/ci/catalog/mock.js
@@ -1,5 +1,3 @@
-import { componentsMockData } from '~/ci/catalog/constants';
-
 export const emptyCatalogResponseBody = {
   data: {
     ciCatalogResources: {
@@ -382,14 +380,47 @@ const generateResourcesNodes = (count = 20, startId = 0) => {
 
 export const mockCatalogResourceItem = generateResourcesNodes(1)[0];
 
+const componentsMockData = {
+  __typename: 'CiComponentConnection',
+  nodes: [
+    {
+      id: 'gid://gitlab/Ci::Component/1',
+      name: 'Ruby gal',
+      description: 'This is a pretty amazing component that does EVERYTHING ruby.',
+      path: 'gitlab.com/gitlab-org/ruby-gal@~latest',
+      inputs: [{ name: 'version', default: '1.0.0', required: true }],
+    },
+    {
+      id: 'gid://gitlab/Ci::Component/2',
+      name: 'Javascript madness',
+      description: 'Adds some spice to your life.',
+      path: 'gitlab.com/gitlab-org/javascript-madness@~latest',
+      inputs: [
+        { name: 'isFun', default: 'true', required: true },
+        { name: 'RandomNumber', default: '10', required: false },
+      ],
+    },
+    {
+      id: 'gid://gitlab/Ci::Component/3',
+      name: 'Go go go',
+      description: 'When you write Go, you gotta go go go.',
+      path: 'gitlab.com/gitlab-org/go-go-go@~latest',
+      inputs: [{ name: 'version', default: '1.0.0', required: true }],
+    },
+  ],
+};
+
 export const mockComponents = {
   data: {
     ciCatalogResource: {
       __typename: 'CiCatalogResource',
       id: `gid://gitlab/CiCatalogResource/1`,
-      webPath: 'twitter/project-1',
-      components: {
-        ...componentsMockData,
+      webPath: '/twitter/project-1',
+      latestVersion: {
+        id: 'gid://gitlab/Version/1',
+        components: {
+          ...componentsMockData,
+        },
       },
     },
   },
@@ -400,8 +431,11 @@ export const mockComponentsEmpty = {
     ciCatalogResource: {
       __typename: 'CiCatalogResource',
       id: `gid://gitlab/CiCatalogResource/1`,
-      webPath: 'twitter/project-1',
-      components: [],
+      webPath: '/twitter/project-1',
+      latestVersion: {
+        id: 'gid://gitlab/Version/1',
+        components: [],
+      },
     },
   },
 };