diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-02 12:11:55 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-02 12:11:55 +0300 |
| commit | ef7001c9c641c1e77ae203650efc0d9aa71a2e3e (patch) | |
| tree | 86a95ca38c95806f7d8177f59353776349235b52 /spec/javascripts/blob | |
| parent | dc3d778fac4f9b0d4fbcb574f9ef3b0cd11ad640 (diff) | |
| parent | 6068b863c66f785bea0a56881d60e8c23da08a0b (diff) | |
Merge branch 'master' into 'balsalmiq-support'
# Conflicts:
# spec/features/projects/commit/cherry_pick_spec.rb
# spec/features/projects/environments/environment_spec.rb
Diffstat (limited to 'spec/javascripts/blob')
| -rw-r--r-- | spec/javascripts/blob/pdf/index_spec.js | 6 | ||||
| -rw-r--r-- | spec/javascripts/blob/pdf/test.pdf | bin | 11956 -> 0 bytes |
2 files changed, 4 insertions, 2 deletions
diff --git a/spec/javascripts/blob/pdf/index_spec.js b/spec/javascripts/blob/pdf/index_spec.js index d3a4d04345b..bbeaf95e68d 100644 --- a/spec/javascripts/blob/pdf/index_spec.js +++ b/spec/javascripts/blob/pdf/index_spec.js @@ -1,5 +1,7 @@ +/* eslint-disable import/no-unresolved */ + import renderPDF from '~/blob/pdf'; -import testPDF from './test.pdf'; +import testPDF from '../../fixtures/blob/pdf/test.pdf'; describe('PDF renderer', () => { let viewer; @@ -59,7 +61,7 @@ describe('PDF renderer', () => { describe('error getting file', () => { beforeEach((done) => { - viewer.dataset.endpoint = 'invalid/endpoint'; + viewer.dataset.endpoint = 'invalid/path/to/file.pdf'; app = renderPDF(); checkLoaded(done); diff --git a/spec/javascripts/blob/pdf/test.pdf b/spec/javascripts/blob/pdf/test.pdf Binary files differdeleted file mode 100644 index eb3d147fde3..00000000000 --- a/spec/javascripts/blob/pdf/test.pdf +++ /dev/null |