Commit da443ff0 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'winh-binary-fixture-path' into 'master'

Use FIXTURES_PATH constant for binary fixtures in frontend tests

See merge request gitlab-org/gitlab-ce!27891
parents e7c4ca86 d89b1947
...@@ -110,7 +110,7 @@ module.exports = function(config) { ...@@ -110,7 +110,7 @@ module.exports = function(config) {
frameworks: ['jasmine'], frameworks: ['jasmine'],
files: [ files: [
{ pattern: 'spec/javascripts/test_bundle.js', watched: false }, { pattern: 'spec/javascripts/test_bundle.js', watched: false },
{ pattern: 'spec/javascripts/fixtures/**/*@(.json|.html|.png)', included: false }, { pattern: `spec/javascripts/fixtures/**/*@(.json|.html|.png|.bmpr|.pdf)`, included: false },
], ],
preprocessors: { preprocessors: {
'spec/javascripts/**/*.js': ['webpack', 'sourcemap'], 'spec/javascripts/**/*.js': ['webpack', 'sourcemap'],
......
import BalsamiqViewer from '~/blob/balsamiq/balsamiq_viewer'; import BalsamiqViewer from '~/blob/balsamiq/balsamiq_viewer';
import bmprPath from '../../fixtures/blob/balsamiq/test.bmpr'; import { FIXTURES_PATH } from 'spec/test_constants';
const bmprPath = `${FIXTURES_PATH}/blob/balsamiq/test.bmpr`;
describe('Balsamiq integration spec', () => { describe('Balsamiq integration spec', () => {
let container; let container;
......
import renderPDF from '~/blob/pdf'; import renderPDF from '~/blob/pdf';
import testPDF from '../../fixtures/blob/pdf/test.pdf'; import { FIXTURES_PATH } from 'spec/test_constants';
const testPDF = `${FIXTURES_PATH}/blob/pdf/test.pdf`;
describe('PDF renderer', () => { describe('PDF renderer', () => {
let viewer; let viewer;
......
...@@ -3,7 +3,9 @@ import { GlobalWorkerOptions } from 'vendor/pdf'; ...@@ -3,7 +3,9 @@ import { GlobalWorkerOptions } from 'vendor/pdf';
import workerSrc from 'vendor/pdf.worker.min'; import workerSrc from 'vendor/pdf.worker.min';
import PDFLab from '~/pdf/index.vue'; import PDFLab from '~/pdf/index.vue';
import pdf from '../fixtures/blob/pdf/test.pdf'; import { FIXTURES_PATH } from 'spec/test_constants';
const pdf = `${FIXTURES_PATH}/blob/pdf/test.pdf`;
GlobalWorkerOptions.workerSrc = workerSrc; GlobalWorkerOptions.workerSrc = workerSrc;
const Component = Vue.extend(PDFLab); const Component = Vue.extend(PDFLab);
......
...@@ -4,7 +4,9 @@ import workerSrc from 'vendor/pdf.worker.min'; ...@@ -4,7 +4,9 @@ import workerSrc from 'vendor/pdf.worker.min';
import PageComponent from '~/pdf/page/index.vue'; import PageComponent from '~/pdf/page/index.vue';
import mountComponent from 'spec/helpers/vue_mount_component_helper'; import mountComponent from 'spec/helpers/vue_mount_component_helper';
import testPDF from 'spec/fixtures/blob/pdf/test.pdf'; import { FIXTURES_PATH } from 'spec/test_constants';
const testPDF = `${FIXTURES_PATH}/blob/pdf/test.pdf`;
describe('Page component', () => { describe('Page component', () => {
const Component = Vue.extend(PageComponent); const Component = Vue.extend(PageComponent);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment