Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

3 files changed, 67 insertions, 8 deletions

diff --git a/spec/frontend/environments/environment_table_spec.js b/spec/frontend/environments/environment_table_spec.js
index 863c4526bb9..71426ee5170 100644
--- a/spec/frontend/environments/environment_table_spec.js
+++ b/spec/frontend/environments/environment_table_spec.js
@@ -89,6 +89,42 @@ describe('Environment table', () => {
     expect(wrapper.find('.deploy-board-icon').exists()).toBe(true);
   });
 
+  it('should render deploy board container when data is provided for children', async () => {
+    const mockItem = {
+      name: 'review',
+      size: 1,
+      environment_path: 'url',
+      logs_path: 'url',
+      id: 1,
+      isFolder: true,
+      isOpen: true,
+      children: [
+        {
+          name: 'review/test',
+          hasDeployBoard: true,
+          deployBoardData: deployBoardMockData,
+          isDeployBoardVisible: true,
+          isLoadingDeployBoard: false,
+          isEmptyDeployBoard: false,
+        },
+      ],
+    };
+
+    await factory({
+      propsData: {
+        environments: [mockItem],
+        canCreateDeployment: false,
+        canReadEnvironment: true,
+        userCalloutsPath: '/callouts',
+        lockPromotionSvgPath: '/assets/illustrations/lock-promotion.svg',
+        helpCanaryDeploymentsPath: 'help/canary-deployments',
+      },
+    });
+
+    expect(wrapper.find('.js-deploy-board-row').exists()).toBe(true);
+    expect(wrapper.find('.deploy-board-icon').exists()).toBe(true);
+  });
+
   it('should toggle deploy board visibility when arrow is clicked', (done) => {
     const mockItem = {
       name: 'review',
@@ -125,7 +161,7 @@ describe('Environment table', () => {
     wrapper.find('.deploy-board-icon').trigger('click');
   });
 
-  it('should set the enviornment to change and weight when a change canary weight event is recevied', async () => {
+  it('should set the environment to change and weight when a change canary weight event is recevied', async () => {
     const mockItem = {
       name: 'review',
       size: 1,
@@ -359,7 +395,7 @@ describe('Environment table', () => {
               },
             },
             {
-              name: 'review/master',
+              name: 'review/main',
               last_deployment: {
                 created_at: '2019-02-17T16:26:15.125Z',
               },
@@ -374,7 +410,7 @@ describe('Environment table', () => {
         },
       ];
       const [production, review, staging] = mockItems;
-      const [addcibuildstatus, master] = mockItems[1].children;
+      const [addcibuildstatus, main] = mockItems[1].children;
 
       factory({
         propsData: {
@@ -390,7 +426,7 @@ describe('Environment table', () => {
         production.name,
       ]);
 
-      expect(wrapper.vm.sortedEnvironments[0].children).toEqual([master, addcibuildstatus]);
+      expect(wrapper.vm.sortedEnvironments[0].children).toEqual([main, addcibuildstatus]);
     });
   });
 });
diff --git a/spec/frontend/environments/environments_store_spec.js b/spec/frontend/environments/environments_store_spec.js
index 4a07281353f..cb2394b224d 100644
--- a/spec/frontend/environments/environments_store_spec.js
+++ b/spec/frontend/environments/environments_store_spec.js
@@ -123,6 +123,29 @@ describe('Store', () => {
 
       expect(store.state.environments[1].children.length).toEqual(serverData.length);
     });
+
+    it('should parse deploy board data for children', () => {
+      store.storeEnvironments(serverData);
+
+      store.setfolderContent(store.state.environments[1], [
+        {
+          name: 'foo',
+          size: 1,
+          latest: {
+            id: 1,
+            rollout_status: deployBoardMockData,
+          },
+        },
+      ]);
+      const result = store.state.environments[1].children[0];
+      expect(result).toMatchObject({
+        deployBoardData: deployBoardMockData,
+        hasDeployBoard: true,
+        isDeployBoardVisible: true,
+        isLoadingDeployBoard: false,
+        isEmptyDeployBoard: false,
+      });
+    });
   });
 
   describe('store pagination', () => {
diff --git a/spec/frontend/environments/mock_data.js b/spec/frontend/environments/mock_data.js
index 4ad005f55c3..9ba71b78c2f 100644
--- a/spec/frontend/environments/mock_data.js
+++ b/spec/frontend/environments/mock_data.js
@@ -76,8 +76,8 @@ const environment = {
     iid: 6,
     sha: '500aabcb17c97bdcf2d0c410b70cb8556f0362dd',
     ref: {
-      name: 'master',
-      ref_url: 'root/ci-folders/tree/master',
+      name: 'main',
+      ref_url: 'root/ci-folders/tree/main',
     },
     tag: true,
     'last?': true,
@@ -130,8 +130,8 @@ const environment = {
     iid: 27,
     sha: '1132df044b73943943c949e7ac2c2f120a89bf59',
     ref: {
-      name: 'master',
-      ref_path: '/root/environment-test/-/tree/master',
+      name: 'main',
+      ref_path: '/root/environment-test/-/tree/main',
     },
     status: 'running',
     created_at: '2020-12-04T19:57:49.514Z',