Merge branch 'ee-10079-env-app' into 'master'

EE: Removes EE differences for env app

See merge request gitlab-org/gitlab-ee!9974

app/assets/javascripts/environments/components/environments_app.vue

 <script>
+import envrionmentsAppMixin from 'ee_else_ce/environments/mixins/environments_app_mixin';
 import Flash from '../../flash';
 import { s__ } from '../../locale';
 import emptyState from './empty_state.vue';
@@ -15,7 +16,7 @@ export default {
     ConfirmRollbackModal,
   },
 
-  mixins: [CIPaginationMixin, environmentsMixin],
+  mixins: [CIPaginationMixin, environmentsMixin, envrionmentsAppMixin],
 
   props: {
     endpoint: {
@@ -42,49 +43,17 @@ export default {
       type: String,
       required: true,
     },
-    // ee-only start
-    canaryDeploymentFeatureId: {
-      type: String,
-      required: true,
-    },
-    showCanaryDeploymentCallout: {
-      type: Boolean,
-      required: true,
-    },
-    userCalloutsPath: {
-      type: String,
-      required: true,
-    },
-    lockPromotionSvgPath: {
-      type: String,
-      required: true,
-    },
-    helpCanaryDeploymentsPath: {
-      type: String,
-      required: true,
-    },
-    // ee-only end
   },
 
   created() {
     eventHub.$on('toggleFolder', this.toggleFolder);
-    eventHub.$on('toggleDeployBoard', this.toggleDeployBoard);
   },
 
   beforeDestroy() {
     eventHub.$off('toggleFolder');
-    eventHub.$off('toggleDeployBoard');
   },
 
   methods: {
-    /**
-     * Toggles the visibility of the deploy boards of the clicked environment.
-     * @param {Object} model
-     */
-    toggleDeployBoard(model) {
-      this.store.toggleDeployBoard(model.id);
-    },
-
     toggleFolder(folder) {
       this.store.toggleFolder(folder);
 
@@ -127,9 +96,9 @@ export default {
       <tabs :tabs="tabs" scope="environments" @onChangeTab="onChangeTab" />
 
       <div v-if="canCreateEnvironment && !isLoading" class="nav-controls">
-        <a :href="newEnvironmentPath" class="btn btn-success">{{
-          s__('Environments|New environment')
-        }}</a>
+        <a :href="newEnvironmentPath" class="btn btn-success">
+          {{ s__('Environments|New environment') }}
+        </a>
       </div>
     </div>
 

app/assets/javascripts/environments/mixins/environments_app_mixin.js

+export default {
+  props: {
+    canaryDeploymentFeatureId: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    showCanaryDeploymentCallout: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+    userCalloutsPath: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    lockPromotionSvgPath: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    helpCanaryDeploymentsPath: {
+      type: String,
+      required: false,
+      default: '',
+    },
+  },
+  metods: {
+    toggleDeployBoard() {},
+  },
+};

ee/app/assets/javascripts/environments/mixins/environments_app_mixin.js

+import eventHub from '~/environments/event_hub';
+
+export default {
+  props: {
+    canaryDeploymentFeatureId: {
+      type: String,
+      required: true,
+    },
+    showCanaryDeploymentCallout: {
+      type: Boolean,
+      required: true,
+    },
+    userCalloutsPath: {
+      type: String,
+      required: true,
+    },
+    lockPromotionSvgPath: {
+      type: String,
+      required: true,
+    },
+    helpCanaryDeploymentsPath: {
+      type: String,
+      required: true,
+    },
+  },
+
+  created() {
+    eventHub.$on('toggleDeployBoard', this.toggleDeployBoard);
+  },
+
+  beforeDestroy() {
+    eventHub.$off('toggleDeployBoard');
+  },
+
+  methods: {
+    /**
+     * Toggles the visibility of the deploy boards of the clicked environment.
+     * @param {Object} model
+     */
+    toggleDeployBoard(model) {
+      this.store.toggleDeployBoard(model.id);
+    },
+  },
+};

ee/spec/javascripts/environments/environments_app_spec.js

+import Vue from 'vue';
+import MockAdapter from 'axios-mock-adapter';
+import axios from '~/lib/utils/axios_utils';
+import environmentsComponent from '~/environments/components/environments_app.vue';
+import mountComponent from 'spec/helpers/vue_mount_component_helper';
+import { environment, folder } from 'spec/environments/mock_data';
+
+describe('Environment', () => {
+  const mockData = {
+    endpoint: 'environments.json',
+    canCreateEnvironment: true,
+    canReadEnvironment: true,
+    cssContainerClass: 'container',
+    newEnvironmentPath: 'environments/new',
+    helpPagePath: 'help',
+    canaryDeploymentFeatureId: 'canary_deployment',
+    showCanaryDeploymentCallout: true,
+    userCalloutsPath: '/callouts',
+    lockPromotionSvgPath: '/assets/illustrations/lock-promotion.svg',
+    helpCanaryDeploymentsPath: 'help/canary-deployments',
+  };
+
+  let EnvironmentsComponent;
+  let component;
+  let mock;
+
+  beforeEach(() => {
+    mock = new MockAdapter(axios);
+
+    EnvironmentsComponent = Vue.extend(environmentsComponent);
+  });
+
+  afterEach(() => {
+    component.$destroy();
+    mock.restore();
+  });
+
+  describe('successful request', () => {
+    describe('without environments', () => {
+      beforeEach(done => {
+        mock.onGet(mockData.endpoint).reply(200, { environments: [] });
+
+        component = mountComponent(EnvironmentsComponent, mockData);
+
+        setTimeout(() => {
+          done();
+        }, 0);
+      });
+
+      it('should render the empty state', () => {
+        expect(component.$el.querySelector('.js-new-environment-button').textContent).toContain(
+          'New environment',
+        );
+
+        expect(component.$el.querySelector('.js-blank-state-title').textContent).toContain(
+          "You don't have any environments right now",
+        );
+      });
+    });
+
+    describe('with paginated environments', () => {
+      beforeEach(done => {
+        mock.onGet(mockData.endpoint).reply(
+          200,
+          {
+            environments: [environment],
+            stopped_count: 1,
+            available_count: 0,
+          },
+          {
+            'X-nExt-pAge': '2',
+            'x-page': '1',
+            'X-Per-Page': '1',
+            'X-Prev-Page': '',
+            'X-TOTAL': '37',
+            'X-Total-Pages': '2',
+          },
+        );
+
+        component = mountComponent(EnvironmentsComponent, mockData);
+
+        setTimeout(() => {
+          done();
+        }, 0);
+      });
+
+      it('should render a table with environments', () => {
+        expect(component.$el.querySelectorAll('table')).not.toBeNull();
+        expect(component.$el.querySelector('.environment-name').textContent.trim()).toEqual(
+          environment.name,
+        );
+      });
+
+      describe('pagination', () => {
+        it('should render pagination', () => {
+          expect(component.$el.querySelectorAll('.gl-pagination li').length).toEqual(5);
+        });
+
+        it('should make an API request when page is clicked', done => {
+          spyOn(component, 'updateContent');
+          setTimeout(() => {
+            component.$el.querySelector('.gl-pagination li:nth-child(5) .page-link').click();
+
+            expect(component.updateContent).toHaveBeenCalledWith({ scope: 'available', page: '2' });
+            done();
+          }, 0);
+        });
+
+        it('should make an API request when using tabs', done => {
+          setTimeout(() => {
+            spyOn(component, 'updateContent');
+            component.$el.querySelector('.js-environments-tab-stopped').click();
+
+            expect(component.updateContent).toHaveBeenCalledWith({ scope: 'stopped', page: '1' });
+            done();
+          }, 0);
+        });
+      });
+
+      describe('deploy boards', () => {
+        it('should render arrow to open deploy boards', done => {
+          setTimeout(() => {
+            expect(
+              component.$el.querySelector('.deploy-board-icon.ic-chevron-right'),
+            ).toBeDefined();
+            done();
+          }, 0);
+        });
+      });
+    });
+
+    // ee-only start
+    describe('canary callout', () => {
+      it('should render banner underneath second environment', done => {
+        mock.onGet(mockData.endpoint).reply(
+          200,
+          {
+            environments: [environment, environment],
+            stopped_count: 1,
+            available_count: 0,
+          },
+          {
+            'X-nExt-pAge': '2',
+            'x-page': '1',
+            'X-Per-Page': '1',
+            'X-Prev-Page': '',
+            'X-TOTAL': '37',
+            'X-Total-Pages': '2',
+          },
+        );
+
+        component = mountComponent(EnvironmentsComponent, mockData);
+
+        setTimeout(() => {
+          expect(
+            component.$el
+              .querySelector('.canary-deployment-callout')
+              .getAttribute('data-js-canary-promo-key'),
+          ).toBe('1');
+          done();
+        }, 0);
+      });
+
+      it('should render banner underneath first environment', done => {
+        mock.onGet(mockData.endpoint).reply(
+          200,
+          {
+            environments: [environment],
+            stopped_count: 1,
+            available_count: 0,
+          },
+          {
+            'X-nExt-pAge': '2',
+            'x-page': '1',
+            'X-Per-Page': '1',
+            'X-Prev-Page': '',
+            'X-TOTAL': '37',
+            'X-Total-Pages': '2',
+          },
+        );
+
+        component = mountComponent(EnvironmentsComponent, mockData);
+
+        setTimeout(() => {
+          expect(
+            component.$el
+              .querySelector('.canary-deployment-callout')
+              .getAttribute('data-js-canary-promo-key'),
+          ).toBe('0');
+          done();
+        }, 0);
+      });
+    });
+    // ee-only end
+  });
+
+  describe('unsuccessfull request', () => {
+    beforeEach(done => {
+      mock.onGet(mockData.endpoint).reply(500, {});
+
+      component = mountComponent(EnvironmentsComponent, mockData);
+
+      setTimeout(() => {
+        done();
+      }, 0);
+    });
+
+    it('should render empty state', () => {
+      expect(component.$el.querySelector('.js-blank-state-title').textContent).toContain(
+        "You don't have any environments right now",
+      );
+    });
+  });
+
+  describe('expandable folders', () => {
+    beforeEach(() => {
+      mock.onGet(mockData.endpoint).reply(
+        200,
+        {
+          environments: [folder],
+          stopped_count: 0,
+          available_count: 1,
+        },
+        {
+          'X-nExt-pAge': '2',
+          'x-page': '1',
+          'X-Per-Page': '1',
+          'X-Prev-Page': '',
+          'X-TOTAL': '37',
+          'X-Total-Pages': '2',
+        },
+      );
+
+      mock.onGet(environment.folder_path).reply(200, { environments: [environment] });
+
+      component = mountComponent(EnvironmentsComponent, mockData);
+    });
+
+    it('should open a closed folder', done => {
+      setTimeout(() => {
+        component.$el.querySelector('.folder-name').click();
+
+        Vue.nextTick(() => {
+          expect(component.$el.querySelector('.folder-icon.ic-chevron-right')).toBe(null);
+          done();
+        });
+      }, 0);
+    });
+
+    it('should close an opened folder', done => {
+      setTimeout(() => {
+        // open folder
+        component.$el.querySelector('.folder-name').click();
+
+        Vue.nextTick(() => {
+          // close folder
+          component.$el.querySelector('.folder-name').click();
+
+          Vue.nextTick(() => {
+            expect(component.$el.querySelector('.folder-icon.ic-chevron-down')).toBe(null);
+            done();
+          });
+        });
+      }, 0);
+    });
+
+    it('should show children environments and a button to show all environments', done => {
+      setTimeout(() => {
+        // open folder
+        component.$el.querySelector('.folder-name').click();
+
+        Vue.nextTick(() => {
+          // wait for next async request
+          setTimeout(() => {
+            expect(component.$el.querySelectorAll('.js-child-row').length).toEqual(1);
+            expect(component.$el.querySelector('.text-center > a.btn').textContent).toContain(
+              'Show all',
+            );
+            done();
+          });
+        });
+      }, 0);
+    });
+  });
+
+  describe('methods', () => {
+    beforeEach(() => {
+      mock.onGet(mockData.endpoint).reply(
+        200,
+        {
+          environments: [],
+          stopped_count: 0,
+          available_count: 1,
+        },
+        {},
+      );
+
+      component = mountComponent(EnvironmentsComponent, mockData);
+      spyOn(window.history, 'pushState').and.stub();
+    });
+
+    describe('updateContent', () => {
+      it('should set given parameters', done => {
+        component
+          .updateContent({ scope: 'stopped', page: '3' })
+          .then(() => {
+            expect(component.page).toEqual('3');
+            expect(component.scope).toEqual('stopped');
+            expect(component.requestData.scope).toEqual('stopped');
+            expect(component.requestData.page).toEqual('3');
+            done();
+          })
+          .catch(done.fail);
+      });
+    });
+
+    describe('onChangeTab', () => {
+      it('should set page to 1', () => {
+        spyOn(component, 'updateContent');
+        component.onChangeTab('stopped');
+
+        expect(component.updateContent).toHaveBeenCalledWith({ scope: 'stopped', page: '1' });
+      });
+    });
+
+    describe('onChangePage', () => {
+      it('should update page and keep scope', () => {
+        spyOn(component, 'updateContent');
+        component.onChangePage(4);
+
+        expect(component.updateContent).toHaveBeenCalledWith({ scope: component.scope, page: '4' });
+      });
+    });
+  });
+});

spec/javascripts/environments/environments_app_spec.js

@@ -13,13 +13,11 @@ describe('Environment', () => {
     cssContainerClass: 'container',
     newEnvironmentPath: 'environments/new',
     helpPagePath: 'help',
-    // ee-only start
     canaryDeploymentFeatureId: 'canary_deployment',
     showCanaryDeploymentCallout: true,
     userCalloutsPath: '/callouts',
     lockPromotionSvgPath: '/assets/illustrations/lock-promotion.svg',
     helpCanaryDeploymentsPath: 'help/canary-deployments',
-    // ee-only end
   };
 
   let EnvironmentsComponent;
@@ -118,82 +116,7 @@ describe('Environment', () => {
           }, 0);
         });
       });
-
-      describe('deploy boards', () => {
-        it('should render arrow to open deploy boards', done => {
-          setTimeout(() => {
-            expect(
-              component.$el.querySelector('.deploy-board-icon.ic-chevron-right'),
-            ).toBeDefined();
-            done();
-          }, 0);
-        });
-      });
-    });
-
-    // ee-only start
-    describe('canary callout', () => {
-      it('should render banner underneath second environment', done => {
-        mock.onGet(mockData.endpoint).reply(
-          200,
-          {
-            environments: [environment, environment],
-            stopped_count: 1,
-            available_count: 0,
-          },
-          {
-            'X-nExt-pAge': '2',
-            'x-page': '1',
-            'X-Per-Page': '1',
-            'X-Prev-Page': '',
-            'X-TOTAL': '37',
-            'X-Total-Pages': '2',
-          },
-        );
-
-        component = mountComponent(EnvironmentsComponent, mockData);
-
-        setTimeout(() => {
-          expect(
-            component.$el
-              .querySelector('.canary-deployment-callout')
-              .getAttribute('data-js-canary-promo-key'),
-          ).toBe('1');
-          done();
-        }, 0);
-      });
-
-      it('should render banner underneath first environment', done => {
-        mock.onGet(mockData.endpoint).reply(
-          200,
-          {
-            environments: [environment],
-            stopped_count: 1,
-            available_count: 0,
-          },
-          {
-            'X-nExt-pAge': '2',
-            'x-page': '1',
-            'X-Per-Page': '1',
-            'X-Prev-Page': '',
-            'X-TOTAL': '37',
-            'X-Total-Pages': '2',
-          },
-        );
-
-        component = mountComponent(EnvironmentsComponent, mockData);
-
-        setTimeout(() => {
-          expect(
-            component.$el
-              .querySelector('.canary-deployment-callout')
-              .getAttribute('data-js-canary-promo-key'),
-          ).toBe('0');
-          done();
-        }, 0);
-      });
     });
-    // ee-only end
   });
 
   describe('unsuccessfull request', () => {