diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-02 07:48:26 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-02 07:48:26 +0000 |
| commit | 02dcecdb5f51f6988ede356d0d245d6cd7745520 (patch) | |
| tree | c6a26a6f6a0e112ba88043ceec336a95cee86deb /spec | |
| parent | 3098259e90616c86d9c0b0c5861b9871c92b7da1 (diff) | |
| parent | f0285c2bff35bdde64e76282a1e2883f3251cb26 (diff) | |
| download | gitlab-ce-02dcecdb5f51f6988ede356d0d245d6cd7745520.tar.gz | |
Merge branch 'security-55503-fix-pdf-js-vulnerability' into 'master'
Fix PDF.js vulnerability
See merge request gitlab/gitlabhq!2999
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/javascripts/pdf/index_spec.js | 4 | ||||
| -rw-r--r-- | spec/javascripts/pdf/page_spec.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/pdf/index_spec.js b/spec/javascripts/pdf/index_spec.js index 699cf4871aa..6df4ded92f0 100644 --- a/spec/javascripts/pdf/index_spec.js +++ b/spec/javascripts/pdf/index_spec.js @@ -1,11 +1,11 @@ import Vue from 'vue'; -import { PDFJS } from 'vendor/pdf'; +import { GlobalWorkerOptions } from 'vendor/pdf'; import workerSrc from 'vendor/pdf.worker.min'; import PDFLab from '~/pdf/index.vue'; import pdf from '../fixtures/blob/pdf/test.pdf'; -PDFJS.workerSrc = workerSrc; +GlobalWorkerOptions.workerSrc = workerSrc; const Component = Vue.extend(PDFLab); describe('PDF component', () => { diff --git a/spec/javascripts/pdf/page_spec.js b/spec/javascripts/pdf/page_spec.js index ef967210b65..b2e9fa42a63 100644 --- a/spec/javascripts/pdf/page_spec.js +++ b/spec/javascripts/pdf/page_spec.js @@ -12,7 +12,7 @@ describe('Page component', () => { let testPage; beforeEach(done => { - pdfjsLib.PDFJS.workerSrc = workerSrc; + pdfjsLib.GlobalWorkerOptions.workerSrc = workerSrc; pdfjsLib .getDocument(testPDF) .then(pdf => pdf.getPage(1)) |