diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-03-08 00:26:39 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-03-08 00:26:39 +0300 |
commit | 1804b3dc0d491a369ef2b05e3ac1ac867c308cc5 (patch) | |
tree | bef04883d68cdaa4da5fd301e481de4bbf046846 /spec/javascripts | |
parent | 77570977e9c6c8d3ebbf638f3f5c6d4746e84279 (diff) | |
parent | ace3bcdda42ce7c9031d938f8dd53f207121654e (diff) |
Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'
Create CI/CD-only projects from GitHub -- CE backport
See merge request gitlab-org/gitlab-ce!17432
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/importer_status_spec.js | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/spec/javascripts/importer_status_spec.js b/spec/javascripts/importer_status_spec.js index 71a2cd51f63..0575d02886d 100644 --- a/spec/javascripts/importer_status_spec.js +++ b/spec/javascripts/importer_status_spec.js @@ -29,7 +29,10 @@ describe('Importer Status', () => { `); spyOn(ImporterStatus.prototype, 'initStatusPage').and.callFake(() => {}); spyOn(ImporterStatus.prototype, 'setAutoUpdate').and.callFake(() => {}); - instance = new ImporterStatus('', importUrl); + instance = new ImporterStatus({ + jobsUrl: '', + importUrl, + }); }); it('sets table row to active after post request', (done) => { @@ -65,7 +68,9 @@ describe('Importer Status', () => { spyOn(ImporterStatus.prototype, 'initStatusPage').and.callFake(() => {}); spyOn(ImporterStatus.prototype, 'setAutoUpdate').and.callFake(() => {}); - instance = new ImporterStatus(jobsUrl); + instance = new ImporterStatus({ + jobsUrl, + }); }); function setupMock(importStatus) { @@ -86,17 +91,17 @@ describe('Importer Status', () => { it('sets the job status to done', (done) => { setupMock('finished'); - expectJobStatus(done, 'done'); + expectJobStatus(done, 'Done'); }); it('sets the job status to scheduled', (done) => { setupMock('scheduled'); - expectJobStatus(done, 'scheduled'); + expectJobStatus(done, 'Scheduled'); }); it('sets the job status to started', (done) => { setupMock('started'); - expectJobStatus(done, 'started'); + expectJobStatus(done, 'Started'); }); it('sets the job status to custom status', (done) => { |