diff options
author | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2021-01-20 13:34:23 -0600 |
commit | 6438df3a1e0fb944485cebf07976160184697d72 (patch) | |
tree | 00b09bfd170e77ae9391b1a2f5a93ef6839f2597 /spec/frontend/commit | |
parent | 42bcd54d971da7ef2854b896a7b34f4ef8601067 (diff) | |
download | gitlab-ce-6438df3a1e0fb944485cebf07976160184697d72.tar.gz |
Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42
Diffstat (limited to 'spec/frontend/commit')
-rw-r--r-- | spec/frontend/commit/commit_pipeline_status_component_spec.js | 4 | ||||
-rw-r--r-- | spec/frontend/commit/pipelines/pipelines_spec.js | 30 |
2 files changed, 17 insertions, 17 deletions
diff --git a/spec/frontend/commit/commit_pipeline_status_component_spec.js b/spec/frontend/commit/commit_pipeline_status_component_spec.js index 625024ee61f..6e4368b5de8 100644 --- a/spec/frontend/commit/commit_pipeline_status_component_spec.js +++ b/spec/frontend/commit/commit_pipeline_status_component_spec.js @@ -1,11 +1,11 @@ import Visibility from 'visibilityjs'; import { GlLoadingIcon } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; +import { getJSONFixture } from 'helpers/fixtures'; import Poll from '~/lib/utils/poll'; import { deprecatedCreateFlash as flash } from '~/flash'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; import CommitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue'; -import { getJSONFixture } from '../helpers/fixtures'; jest.mock('~/lib/utils/poll'); jest.mock('visibilityjs'); @@ -105,7 +105,7 @@ describe('Commit pipeline status component', () => { describe('when polling', () => { let pollConfig; beforeEach(() => { - Poll.mockImplementation(config => { + Poll.mockImplementation((config) => { pollConfig = config; return { makeRequest: jest.fn(), restart: jest.fn(), stop: jest.fn() }; }); diff --git a/spec/frontend/commit/pipelines/pipelines_spec.js b/spec/frontend/commit/pipelines/pipelines_spec.js index a196b66daa0..15b1f224699 100644 --- a/spec/frontend/commit/pipelines/pipelines_spec.js +++ b/spec/frontend/commit/pipelines/pipelines_spec.js @@ -31,7 +31,7 @@ describe('Pipelines table in Commits and Merge requests', () => { const { pipelines } = getJSONFixture(jsonFixtureName); PipelinesTable = Vue.extend(pipelinesTable); - pipeline = pipelines.find(p => p.user !== null && p.commit !== null); + pipeline = pipelines.find((p) => p.user !== null && p.commit !== null); }); afterEach(() => { @@ -47,7 +47,7 @@ describe('Pipelines table in Commits and Merge requests', () => { vm = mountComponent(PipelinesTable, props); }); - it('should render the empty state', done => { + it('should render the empty state', (done) => { setImmediate(() => { expect(vm.$el.querySelector('.empty-state')).toBeDefined(); expect(vm.$el.querySelector('.realtime-loading')).toBe(null); @@ -63,7 +63,7 @@ describe('Pipelines table in Commits and Merge requests', () => { vm = mountComponent(PipelinesTable, props); }); - it('should render a table with the received pipelines', done => { + it('should render a table with the received pipelines', (done) => { setImmediate(() => { expect(vm.$el.querySelectorAll('.ci-table .commit').length).toEqual(1); expect(vm.$el.querySelector('.realtime-loading')).toBe(null); @@ -74,7 +74,7 @@ describe('Pipelines table in Commits and Merge requests', () => { }); describe('with pagination', () => { - it('should make an API request when using pagination', done => { + it('should make an API request when using pagination', (done) => { setImmediate(() => { jest.spyOn(vm, 'updateContent').mockImplementation(() => {}); @@ -102,11 +102,11 @@ describe('Pipelines table in Commits and Merge requests', () => { mock.onGet('endpoint.json').reply(200, [pipeline]); }); - it('should receive update-pipelines-count event', done => { + it('should receive update-pipelines-count event', (done) => { const element = document.createElement('div'); document.body.appendChild(element); - element.addEventListener('update-pipelines-count', event => { + element.addEventListener('update-pipelines-count', (event) => { expect(event.detail.pipelines).toEqual([pipeline]); done(); }); @@ -126,7 +126,7 @@ describe('Pipelines table in Commits and Merge requests', () => { }); describe('when latest pipeline has detached flag', () => { - it('renders the run pipeline button', done => { + it('renders the run pipeline button', (done) => { pipelineCopy.flags.detached_merge_request_pipeline = true; pipelineCopy.flags.merge_request_pipeline = true; @@ -143,7 +143,7 @@ describe('Pipelines table in Commits and Merge requests', () => { }); describe('when latest pipeline does not have detached flag', () => { - it('does not render the run pipeline button', done => { + it('does not render the run pipeline button', (done) => { pipelineCopy.flags.detached_merge_request_pipeline = false; pipelineCopy.flags.merge_request_pipeline = false; @@ -163,7 +163,7 @@ describe('Pipelines table in Commits and Merge requests', () => { const findModal = () => document.querySelector('#create-pipeline-for-fork-merge-request-modal'); - beforeEach(done => { + beforeEach((done) => { pipelineCopy.flags.detached_merge_request_pipeline = true; mock.onGet('endpoint.json').reply(200, [pipelineCopy]); @@ -182,7 +182,7 @@ describe('Pipelines table in Commits and Merge requests', () => { }); }); - it('on desktop, shows a loading button', done => { + it('on desktop, shows a loading button', (done) => { findRunPipelineBtn().click(); vm.$nextTick(() => { @@ -200,7 +200,7 @@ describe('Pipelines table in Commits and Merge requests', () => { }); }); - it('on mobile, shows a loading button', done => { + it('on mobile, shows a loading button', (done) => { findRunPipelineBtnMobile().click(); vm.$nextTick(() => { @@ -223,7 +223,7 @@ describe('Pipelines table in Commits and Merge requests', () => { const findModal = () => document.querySelector('#create-pipeline-for-fork-merge-request-modal'); - beforeEach(done => { + beforeEach((done) => { pipelineCopy.flags.detached_merge_request_pipeline = true; mock.onGet('endpoint.json').reply(200, [pipelineCopy]); @@ -244,7 +244,7 @@ describe('Pipelines table in Commits and Merge requests', () => { }); }); - it('on desktop, shows a security warning modal', done => { + it('on desktop, shows a security warning modal', (done) => { findRunPipelineBtn().click(); vm.$nextTick(() => { @@ -253,7 +253,7 @@ describe('Pipelines table in Commits and Merge requests', () => { }); }); - it('on mobile, shows a security warning modal', done => { + it('on mobile, shows a security warning modal', (done) => { findRunPipelineBtnMobile().click(); vm.$nextTick(() => { @@ -271,7 +271,7 @@ describe('Pipelines table in Commits and Merge requests', () => { vm = mountComponent(PipelinesTable, props); }); - it('should render error state', done => { + it('should render error state', (done) => { setImmediate(() => { expect(vm.$el.querySelector('.js-pipelines-error-state')).toBeDefined(); expect(vm.$el.querySelector('.realtime-loading')).toBe(null); |