Add latest changes from gitlab-org/gitlab@master

6 files changed, 175 insertions, 432 deletions

diff --git a/spec/config/settings_spec.rb b/spec/config/settings_spec.rb
index 26d92593a08..20c0b92f135 100644
--- a/spec/config/settings_spec.rb
+++ b/spec/config/settings_spec.rb
@@ -9,6 +9,12 @@ describe Settings do
     end
   end
 
+  describe '.load_dynamic_cron_schedules!' do
+    it 'generates a valid cron schedule' do
+      expect(Fugit::Cron.parse(described_class.load_dynamic_cron_schedules!)).to be_a(Fugit::Cron)
+    end
+  end
+
   describe '.attr_encrypted_db_key_base_truncated' do
     it 'is a string with maximum 32 bytes size' do
       expect(described_class.attr_encrypted_db_key_base_truncated.bytesize)
diff --git a/spec/frontend/create_merge_request_dropdown_spec.js b/spec/frontend/create_merge_request_dropdown_spec.js
index 7d26f17ed23..bdf03853597 100644
--- a/spec/frontend/create_merge_request_dropdown_spec.js
+++ b/spec/frontend/create_merge_request_dropdown_spec.js
@@ -15,7 +15,7 @@ describe('CreateMergeRequestDropdown', () => {
       <div id="dummy-wrapper-element">
         <div class="available"></div>
         <div class="unavailable">
-          <div class="fa"></div>
+          <div class="spinner"></div>
           <div class="text"></div>
         </div>
         <div class="js-ref"></div>
diff --git a/spec/frontend/environments/environments_app_spec.js b/spec/frontend/environments/environments_app_spec.js
new file mode 100644
index 00000000000..f3d2bd2462e
--- /dev/null
+++ b/spec/frontend/environments/environments_app_spec.js
@@ -0,0 +1,168 @@
+import { mount, shallowMount } from '@vue/test-utils';
+import axios from '~/lib/utils/axios_utils';
+import MockAdapter from 'axios-mock-adapter';
+import Container from '~/environments/components/container.vue';
+import EmptyState from '~/environments/components/empty_state.vue';
+import EnvironmentsApp from '~/environments/components/environments_app.vue';
+import { environment, folder } from './mock_data';
+
+describe('Environment', () => {
+  let mock;
+  let wrapper;
+
+  const mockData = {
+    endpoint: 'environments.json',
+    canCreateEnvironment: true,
+    canReadEnvironment: true,
+    newEnvironmentPath: 'environments/new',
+    helpPagePath: 'help',
+    canaryDeploymentFeatureId: 'canary_deployment',
+    showCanaryDeploymentCallout: true,
+    userCalloutsPath: '/callouts',
+    lockPromotionSvgPath: '/assets/illustrations/lock-promotion.svg',
+    helpCanaryDeploymentsPath: 'help/canary-deployments',
+  };
+
+  const mockRequest = (response, body) => {
+    mock.onGet(mockData.endpoint).reply(response, body, {
+      'X-nExt-pAge': '2',
+      'x-page': '1',
+      'X-Per-Page': '1',
+      'X-Prev-Page': '',
+      'X-TOTAL': '37',
+      'X-Total-Pages': '2',
+    });
+  };
+
+  const createWrapper = (shallow = false) => {
+    const fn = shallow ? shallowMount : mount;
+    wrapper = fn(EnvironmentsApp, { propsData: mockData });
+    return axios.waitForAll();
+  };
+
+  beforeEach(() => {
+    mock = new MockAdapter(axios);
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+    mock.restore();
+  });
+
+  describe('successful request', () => {
+    describe('without environments', () => {
+      beforeEach(() => {
+        mockRequest(200, { environments: [] });
+        return createWrapper(true);
+      });
+
+      it('should render the empty state', () => {
+        expect(wrapper.find(EmptyState).exists()).toBe(true);
+      });
+
+      describe('when it is possible to enable a review app', () => {
+        beforeEach(() => {
+          mockRequest(200, { environments: [], review_app: { can_setup_review_app: true } });
+          return createWrapper();
+        });
+
+        it('should render the enable review app button', () => {
+          expect(wrapper.find('.js-enable-review-app-button').text()).toContain(
+            'Enable review app',
+          );
+        });
+      });
+    });
+
+    describe('with paginated environments', () => {
+      const environmentList = [environment];
+
+      beforeEach(() => {
+        mockRequest(200, {
+          environments: environmentList,
+          stopped_count: 1,
+          available_count: 0,
+        });
+        return createWrapper();
+      });
+
+      it('should render a conatiner table with environments', () => {
+        const containerTable = wrapper.find(Container);
+
+        expect(containerTable.exists()).toBe(true);
+        expect(containerTable.props('environments').length).toEqual(environmentList.length);
+        expect(containerTable.find('.environment-name').text()).toEqual(environmentList[0].name);
+      });
+
+      describe('pagination', () => {
+        it('should render pagination', () => {
+          expect(wrapper.findAll('.gl-pagination li').length).toEqual(9);
+        });
+
+        it('should make an API request when page is clicked', () => {
+          jest.spyOn(wrapper.vm, 'updateContent').mockImplementation(() => {});
+
+          wrapper.find('.gl-pagination li:nth-child(3) .page-link').trigger('click');
+          expect(wrapper.vm.updateContent).toHaveBeenCalledWith({ scope: 'available', page: '2' });
+        });
+
+        it('should make an API request when using tabs', () => {
+          jest.spyOn(wrapper.vm, 'updateContent').mockImplementation(() => {});
+          wrapper.find('.js-environments-tab-stopped').trigger('click');
+          expect(wrapper.vm.updateContent).toHaveBeenCalledWith({ scope: 'stopped', page: '1' });
+        });
+      });
+    });
+  });
+
+  describe('unsuccessful request', () => {
+    beforeEach(() => {
+      mockRequest(500, {});
+      return createWrapper(true);
+    });
+
+    it('should render empty state', () => {
+      expect(wrapper.find(EmptyState).exists()).toBe(true);
+    });
+  });
+
+  describe('expandable folders', () => {
+    beforeEach(() => {
+      mockRequest(200, {
+        environments: [folder],
+        stopped_count: 1,
+        available_count: 0,
+      });
+
+      mock.onGet(environment.folder_path).reply(200, { environments: [environment] });
+
+      return createWrapper().then(() => {
+        // open folder
+        wrapper.find('.folder-name').trigger('click');
+        return axios.waitForAll();
+      });
+    });
+
+    it('should open a closed folder', () => {
+      expect(wrapper.find('.folder-icon.ic-chevron-right').exists()).toBe(false);
+    });
+
+    it('should close an opened folder', () => {
+      expect(wrapper.find('.folder-icon.ic-chevron-down').exists()).toBe(true);
+
+      // close folder
+      wrapper.find('.folder-name').trigger('click');
+      wrapper.vm.$nextTick(() => {
+        expect(wrapper.find('.folder-icon.ic-chevron-down').exists()).toBe(false);
+      });
+    });
+
+    it('should show children environments', () => {
+      expect(wrapper.findAll('.js-child-row').length).toEqual(1);
+    });
+
+    it('should show a button to show all environments', () => {
+      expect(wrapper.find('.text-center > a.btn').text()).toContain('Show all');
+    });
+  });
+});
diff --git a/spec/javascripts/environments/environments_app_spec.js b/spec/javascripts/environments/environments_app_spec.js
deleted file mode 100644
index 6c05b609923..00000000000
--- a/spec/javascripts/environments/environments_app_spec.js
+++ /dev/null
@@ -1,279 +0,0 @@
-import Vue from 'vue';
-import MockAdapter from 'axios-mock-adapter';
-import mountComponent from 'spec/helpers/vue_mount_component_helper';
-import axios from '~/lib/utils/axios_utils';
-import environmentsComponent from '~/environments/components/environments_app.vue';
-import { environment, folder } from './mock_data';
-
-describe('Environment', () => {
-  const mockData = {
-    endpoint: 'environments.json',
-    canCreateEnvironment: true,
-    canReadEnvironment: true,
-    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('when it is possible to enable a review app', () => {
-        beforeEach(done => {
-          mock
-            .onGet(mockData.endpoint)
-            .reply(200, { environments: [], review_app: { can_setup_review_app: true } });
-
-          component = mountComponent(EnvironmentsComponent, mockData);
-
-          setTimeout(() => {
-            done();
-          }, 0);
-        });
-
-        it('should render the enable review app button', () => {
-          expect(component.$el.querySelector('.js-enable-review-app-button').textContent).toContain(
-            'Enable review app',
-          );
-        });
-      });
-    });
-
-    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(9);
-        });
-
-        it('should make an API request when page is clicked', done => {
-          spyOn(component, 'updateContent');
-          setTimeout(() => {
-            component.$el.querySelector('.gl-pagination li:nth-child(3) .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('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' });
-      });
-    });
-  });
-});
diff --git a/spec/javascripts/environments/mock_data.js b/spec/javascripts/environments/mock_data.js
deleted file mode 100644
index a8be3706b79..00000000000
--- a/spec/javascripts/environments/mock_data.js
+++ /dev/null
@@ -1,66 +0,0 @@
-export const environmentsList = [
-  {
-    name: 'DEV',
-    size: 1,
-    id: 7,
-    state: 'available',
-    external_url: null,
-    environment_type: null,
-    last_deployment: null,
-    has_stop_action: false,
-    environment_path: '/root/review-app/environments/7',
-    stop_path: '/root/review-app/environments/7/stop',
-    created_at: '2017-01-31T10:53:46.894Z',
-    updated_at: '2017-01-31T10:53:46.894Z',
-  },
-  {
-    folderName: 'build',
-    size: 5,
-    id: 12,
-    name: 'build/update-README',
-    state: 'available',
-    external_url: null,
-    environment_type: 'build',
-    last_deployment: null,
-    has_stop_action: false,
-    environment_path: '/root/review-app/environments/12',
-    stop_path: '/root/review-app/environments/12/stop',
-    created_at: '2017-02-01T19:42:18.400Z',
-    updated_at: '2017-02-01T19:42:18.400Z',
-  },
-];
-
-export const environment = {
-  name: 'DEV',
-  size: 1,
-  latest: {
-    id: 7,
-    name: 'DEV',
-    state: 'available',
-    external_url: null,
-    environment_type: null,
-    last_deployment: null,
-    has_stop_action: false,
-    environment_path: '/root/review-app/environments/7',
-    stop_path: '/root/review-app/environments/7/stop',
-    created_at: '2017-01-31T10:53:46.894Z',
-    updated_at: '2017-01-31T10:53:46.894Z',
-    folder_path: '/root/review-app/environments/7',
-  },
-};
-
-export const folder = {
-  folderName: 'build',
-  size: 5,
-  id: 12,
-  name: 'build/update-README',
-  state: 'available',
-  external_url: null,
-  environment_type: 'build',
-  last_deployment: null,
-  has_stop_action: false,
-  environment_path: '/root/review-app/environments/12',
-  stop_path: '/root/review-app/environments/12/stop',
-  created_at: '2017-02-01T19:42:18.400Z',
-  updated_at: '2017-02-01T19:42:18.400Z',
-};
diff --git a/spec/lib/gitlab/ci/templates/Jobs/test_gitlab_ci_yaml_spec.rb b/spec/lib/gitlab/ci/templates/Jobs/test_gitlab_ci_yaml_spec.rb
deleted file mode 100644
index 2186bf038eb..00000000000
--- a/spec/lib/gitlab/ci/templates/Jobs/test_gitlab_ci_yaml_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe 'Jobs/Test.gitlab-ci.yml' do
-  subject(:template) { Gitlab::Template::GitlabCiYmlTemplate.find('Jobs/Test') }
-
-  describe 'the created pipeline' do
-    let_it_be(:user) { create(:admin) }
-    let_it_be(:project) { create(:project, :repository) }
-
-    let(:default_branch) { 'master' }
-    let(:pipeline_ref) { default_branch }
-    let(:service) { Ci::CreatePipelineService.new(project, user, ref: pipeline_ref) }
-    let(:pipeline) { service.execute!(:push) }
-    let(:build_names) { pipeline.builds.pluck(:name) }
-
-    before do
-      stub_ci_pipeline_yaml_file(template.content)
-      allow_any_instance_of(Ci::BuildScheduleWorker).to receive(:perform).and_return(true)
-      allow(project).to receive(:default_branch).and_return(default_branch)
-    end
-
-    context 'on master' do
-      it 'creates the test job' do
-        expect(build_names).to contain_exactly('test')
-      end
-    end
-
-    context 'on another branch' do
-      let(:pipeline_ref) { 'feature' }
-
-      it 'creates the test job' do
-        expect(build_names).to contain_exactly('test')
-      end
-    end
-
-    context 'on tag' do
-      let(:pipeline_ref) { 'v1.0.0' }
-
-      it 'creates the test job' do
-        expect(pipeline).to be_tag
-        expect(build_names).to contain_exactly('test')
-      end
-    end
-
-    context 'on merge request' do
-      let(:service) { MergeRequests::CreatePipelineService.new(project, user) }
-      let(:merge_request) { create(:merge_request, :simple, source_project: project) }
-      let(:pipeline) { service.execute(merge_request) }
-
-      it 'has no jobs' do
-        expect(pipeline).to be_merge_request_event
-        expect(build_names).to be_empty
-      end
-    end
-
-    context 'TEST_DISABLED is set' do
-      before do
-        create(:ci_variable, key: 'TEST_DISABLED', value: 'true', project: project)
-      end
-
-      context 'on master' do
-        it 'has no jobs' do
-          expect { pipeline }.to raise_error(Ci::CreatePipelineService::CreateError)
-        end
-      end
-
-      context 'on another branch' do
-        let(:pipeline_ref) { 'feature' }
-
-        it 'has no jobs' do
-          expect { pipeline }.to raise_error(Ci::CreatePipelineService::CreateError)
-        end
-      end
-
-      context 'on tag' do
-        let(:pipeline_ref) { 'v1.0.0' }
-
-        it 'has no jobs' do
-          expect { pipeline }.to raise_error(Ci::CreatePipelineService::CreateError)
-        end
-      end
-    end
-  end
-end