diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-26 21:22:25 +0300 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-03-26 21:22:25 +0300 |
| commit | 78c90cd946361f55f2df0d25e7bb783e4b514495 (patch) | |
| tree | b8dbe5e5ef70953f35ba778b112010f6a2d5b9be /spec | |
| parent | a35e8f47d0da8c6b491ef2e8eec0d28e7458727a (diff) | |
| parent | 23b622005b65b32551a404548e7da8d59553db0b (diff) | |
Merge branch 'security-55503-fix-pdf-js-11-9' into '11-9-stable'
Fix PDF.js vulnerability
See merge request gitlab/gitlabhq!3024
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)) |