diff --git a/package-lock.json b/package-lock.json index d33ea5e..0794b1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7476,6 +7476,34 @@ } } }, + "rollup-plugin-data-files": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-data-files/-/rollup-plugin-data-files-0.1.0.tgz", + "integrity": "sha512-4RpKeF8gjbmrqaMsemVn5rh/+Fmlg9zpai5GgnX6QE5SAWonOjAgf4vwUMt0AtvowpFkcghXMpAhw3hCFX4vWA==", + "dev": true, + "requires": { + "@rollup/pluginutils": "^4.1.0", + "matched": "^5.0.1" + }, + "dependencies": { + "@rollup/pluginutils": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.1.0.tgz", + "integrity": "sha512-TrBhfJkFxA+ER+ew2U2/fHbebhLT/l/2pRk0hfj9KusXUuRXd2v0R58AfaZK9VXDQ4TogOSEmICVrQAA3zFnHQ==", + "dev": true, + "requires": { + "estree-walker": "^2.0.1", + "picomatch": "^2.2.2" + } + }, + "estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "dev": true + } + } + }, "rollup-plugin-istanbul": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/rollup-plugin-istanbul/-/rollup-plugin-istanbul-2.0.1.tgz", diff --git a/package.json b/package.json index ba59761..f2f34f9 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,7 @@ "scripts": { "build-test": "cross-env-shell TEST_BUNDLE_ONLY=1 'npm run build'", "build-prod": "cross-env-shell NO_TEST_BUNDLE=1 'npm run build'", - "build-test-data": "node scripts/m3u8.js", - "build": "npm-run-all -s clean build-test-data -p build:*", + "build": "npm-run-all -s clean -p build:*", "build:js": "rollup -c scripts/rollup.config.js", "clean": "shx rm -rf ./dist ./test/dist && shx mkdir -p ./dist ./test/dist", "lint": "vjsstandard", @@ -76,6 +75,7 @@ "@videojs/generator-helpers": "~2.0.1", "karma": "^5.2.3", "rollup": "^2.36.1", + "rollup-plugin-data-files": "^0.1.0", "sinon": "^9.2.3", "videojs-generate-karma-config": "~7.0.0", "videojs-generate-rollup-config": "~6.1.0", diff --git a/scripts/export-m3u8s.js b/scripts/export-m3u8s.js deleted file mode 100644 index 8842061..0000000 --- a/scripts/export-m3u8s.js +++ /dev/null @@ -1,83 +0,0 @@ -'use strict'; -/* eslint no-console: 0 */ - -const fs = require('fs'); -const path = require('path'); - -const basePath = path.resolve(__dirname, '..'); -const testDataDir = path.join(basePath, 'test'); -const manifestDir = path.join(basePath, 'test', 'fixtures', 'integration'); -const manifestFilepath = path.join(testDataDir, 'dist', 'test-manifests.js'); -const expectedFilepath = path.join(testDataDir, 'dist', 'test-expected.js'); - -const build = function() { - let manifests = 'export default {\n'; - let expected = 'export default {\n'; - - const files = fs.readdirSync(manifestDir); - - while (files.length > 0) { - const file = path.resolve(manifestDir, files.shift()); - const extname = path.extname(file); - - if (extname === '.m3u8') { - // translate this manifest - manifests += ' \'' + path.basename(file, '.m3u8') + '\': '; - manifests += fs.readFileSync(file, 'utf8') - .split(/\r\n|\n/) - // quote and concatenate - .map(function(line) { - return ' \'' + line + '\\n\' +\n'; - }).join('') - // strip leading spaces and the trailing '+' - .slice(4, -3); - manifests += ',\n'; - } else if (extname === '.js') { - // append the expected parse - expected += ' "' + path.basename(file, '.js') + '": '; - expected += fs.readFileSync(file, 'utf8'); - expected += ',\n'; - } else { - console.log('Unknown file ' + file + ' found in manifest dir ' + manifestDir); - } - - } - - // clean up and close the objects - manifests = manifests.slice(0, -2); - manifests += '\n};\n'; - expected = expected.slice(0, -2); - expected += '\n};\n'; - - fs.writeFileSync(manifestFilepath, manifests); - fs.writeFileSync(expectedFilepath, expected); - console.log('Wrote test data file ' + manifestFilepath); - console.log('Wrote test data file ' + expectedFilepath); -}; - -const watch = function() { - build(); - fs.watch(manifestDir, function(event, filename) { - console.log('files in manifest dir were changed rebuilding manifest data'); - build(); - }); -}; - -const clean = function() { - try { - fs.unlinkSync(manifestFilepath); - } catch (e) { - console.log(e); - } - try { - fs.unlinkSync(expectedFilepath); - } catch (e) { - console.log(e); - } -}; - -module.exports = { - build, - watch, - clean -}; diff --git a/scripts/m3u8.js b/scripts/m3u8.js deleted file mode 100644 index b7a0586..0000000 --- a/scripts/m3u8.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict'; -const m3u8 = require('./export-m3u8s.js'); - -const args = require('minimist')(process.argv.slice(2), { - boolean: ['watch', 'clean', 'build'], - default: { - build: true - }, - alias: { - b: 'build', - c: 'clean', - w: 'watch' - } -}); - -if (args.w) { - m3u8.watch(); -} else if (args.c) { - m3u8.clean(); -} else if (args.b) { - m3u8.build(); -} diff --git a/scripts/rollup.config.js b/scripts/rollup.config.js index daf00a3..3fbc276 100644 --- a/scripts/rollup.config.js +++ b/scripts/rollup.config.js @@ -1,5 +1,6 @@ const generate = require('videojs-generate-rollup-config'); const replace = require('@rollup/plugin-replace'); +const dataFiles = require('rollup-plugin-data-files'); // see https://github.com/videojs/videojs-generate-rollup-config // for options @@ -20,10 +21,16 @@ const options = { 'require("@videojs/vhs-utils/es': 'require("@videojs/vhs-utils/cjs' }); + defaults.dataFiles = dataFiles({ + expecteds: {include: 'test/fixtures/integration/*.js', transform: 'js', extensions: false}, + manifests: {include: 'test/fixtures/integration/*.m3u8', transform: 'string', extensions: false} + }); + return defaults; }, plugins(defaults) { defaults.module.unshift('replace'); + defaults.test.unshift('dataFiles'); return defaults; } diff --git a/test/fixtures/integration/absoluteUris.js b/test/fixtures/integration/absoluteUris.js index e210522..d8319b6 100644 --- a/test/fixtures/integration/absoluteUris.js +++ b/test/fixtures/integration/absoluteUris.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/allowCache.js b/test/fixtures/integration/allowCache.js index 5f9537b..a52e9f0 100644 --- a/test/fixtures/integration/allowCache.js +++ b/test/fixtures/integration/allowCache.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/allowCacheInvalid.js b/test/fixtures/integration/allowCacheInvalid.js index 73a4618..4d30574 100644 --- a/test/fixtures/integration/allowCacheInvalid.js +++ b/test/fixtures/integration/allowCacheInvalid.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/alternateAudio.js b/test/fixtures/integration/alternateAudio.js index a12fab7..6b650d3 100644 --- a/test/fixtures/integration/alternateAudio.js +++ b/test/fixtures/integration/alternateAudio.js @@ -1,4 +1,4 @@ -{ +module.exports = { allowCache: true, discontinuityStarts: [], mediaGroups: { diff --git a/test/fixtures/integration/alternateVideo.js b/test/fixtures/integration/alternateVideo.js index ac80526..1935bc2 100644 --- a/test/fixtures/integration/alternateVideo.js +++ b/test/fixtures/integration/alternateVideo.js @@ -1,4 +1,4 @@ -{ +module.exports = { allowCache: true, discontinuityStarts: [], mediaGroups: { diff --git a/test/fixtures/integration/brightcove.js b/test/fixtures/integration/brightcove.js index 5fca360..e9ca510 100644 --- a/test/fixtures/integration/brightcove.js +++ b/test/fixtures/integration/brightcove.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "playlists": [ { diff --git a/test/fixtures/integration/byteRange.js b/test/fixtures/integration/byteRange.js index 47c7582..94ebd4d 100644 --- a/test/fixtures/integration/byteRange.js +++ b/test/fixtures/integration/byteRange.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/dateTime.js b/test/fixtures/integration/dateTime.js index ac8b3c5..0168c93 100644 --- a/test/fixtures/integration/dateTime.js +++ b/test/fixtures/integration/dateTime.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": false, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/disallowCache.js b/test/fixtures/integration/disallowCache.js index f04e5bd..5a93c61 100644 --- a/test/fixtures/integration/disallowCache.js +++ b/test/fixtures/integration/disallowCache.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": false, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/disc-sequence.js b/test/fixtures/integration/disc-sequence.js index 3c8282c..0930ae1 100644 --- a/test/fixtures/integration/disc-sequence.js +++ b/test/fixtures/integration/disc-sequence.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "discontinuitySequence": 3, diff --git a/test/fixtures/integration/discontinuity.js b/test/fixtures/integration/discontinuity.js index 2c72f92..a07565b 100644 --- a/test/fixtures/integration/discontinuity.js +++ b/test/fixtures/integration/discontinuity.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "discontinuitySequence": 0, diff --git a/test/fixtures/integration/domainUris.js b/test/fixtures/integration/domainUris.js index dc0a01b..8610f22 100644 --- a/test/fixtures/integration/domainUris.js +++ b/test/fixtures/integration/domainUris.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/empty.js b/test/fixtures/integration/empty.js index 924f126..7db1577 100644 --- a/test/fixtures/integration/empty.js +++ b/test/fixtures/integration/empty.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "discontinuityStarts": [], "segments": [] diff --git a/test/fixtures/integration/emptyAllowCache.js b/test/fixtures/integration/emptyAllowCache.js index 73a4618..4d30574 100644 --- a/test/fixtures/integration/emptyAllowCache.js +++ b/test/fixtures/integration/emptyAllowCache.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/emptyMediaSequence.js b/test/fixtures/integration/emptyMediaSequence.js index 026260a..cb2fa3c 100644 --- a/test/fixtures/integration/emptyMediaSequence.js +++ b/test/fixtures/integration/emptyMediaSequence.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/emptyPlaylistType.js b/test/fixtures/integration/emptyPlaylistType.js index e18f9bb..66ee5a6 100644 --- a/test/fixtures/integration/emptyPlaylistType.js +++ b/test/fixtures/integration/emptyPlaylistType.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "segments": [ diff --git a/test/fixtures/integration/emptyTargetDuration.js b/test/fixtures/integration/emptyTargetDuration.js index 5fca360..e9ca510 100644 --- a/test/fixtures/integration/emptyTargetDuration.js +++ b/test/fixtures/integration/emptyTargetDuration.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "playlists": [ { diff --git a/test/fixtures/integration/encrypted.js b/test/fixtures/integration/encrypted.js index 89bedf4..879b91f 100644 --- a/test/fixtures/integration/encrypted.js +++ b/test/fixtures/integration/encrypted.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 7794, "discontinuitySequence": 0, diff --git a/test/fixtures/integration/event.js b/test/fixtures/integration/event.js index 28009d4..a101203 100644 --- a/test/fixtures/integration/event.js +++ b/test/fixtures/integration/event.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "EVENT", diff --git a/test/fixtures/integration/extXPlaylistTypeInvalidPlaylist.js b/test/fixtures/integration/extXPlaylistTypeInvalidPlaylist.js index 9d754d5..ded7230 100644 --- a/test/fixtures/integration/extXPlaylistTypeInvalidPlaylist.js +++ b/test/fixtures/integration/extXPlaylistTypeInvalidPlaylist.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 1, "segments": [ diff --git a/test/fixtures/integration/extinf.js b/test/fixtures/integration/extinf.js index cdabe69..4331b7d 100644 --- a/test/fixtures/integration/extinf.js +++ b/test/fixtures/integration/extinf.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/fmp4.js b/test/fixtures/integration/fmp4.js index cbc36ad..c259529 100644 --- a/test/fixtures/integration/fmp4.js +++ b/test/fixtures/integration/fmp4.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 1, "playlistType": "VOD", diff --git a/test/fixtures/integration/headerOnly.js b/test/fixtures/integration/headerOnly.js index 924f126..7db1577 100644 --- a/test/fixtures/integration/headerOnly.js +++ b/test/fixtures/integration/headerOnly.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "discontinuityStarts": [], "segments": [] diff --git a/test/fixtures/integration/invalidAllowCache.js b/test/fixtures/integration/invalidAllowCache.js index 73a4618..4d30574 100644 --- a/test/fixtures/integration/invalidAllowCache.js +++ b/test/fixtures/integration/invalidAllowCache.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/invalidMediaSequence.js b/test/fixtures/integration/invalidMediaSequence.js index 026260a..cb2fa3c 100644 --- a/test/fixtures/integration/invalidMediaSequence.js +++ b/test/fixtures/integration/invalidMediaSequence.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/invalidPlaylistType.js b/test/fixtures/integration/invalidPlaylistType.js index e18f9bb..66ee5a6 100644 --- a/test/fixtures/integration/invalidPlaylistType.js +++ b/test/fixtures/integration/invalidPlaylistType.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "segments": [ diff --git a/test/fixtures/integration/invalidTargetDuration.js b/test/fixtures/integration/invalidTargetDuration.js index 6f0e226..066f60e 100644 --- a/test/fixtures/integration/invalidTargetDuration.js +++ b/test/fixtures/integration/invalidTargetDuration.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/liveMissingSegmentDuration.js b/test/fixtures/integration/liveMissingSegmentDuration.js index 8cc0175..ad90b1a 100644 --- a/test/fixtures/integration/liveMissingSegmentDuration.js +++ b/test/fixtures/integration/liveMissingSegmentDuration.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/liveStart30sBefore.js b/test/fixtures/integration/liveStart30sBefore.js index 84b8cf7..b0c90ec 100644 --- a/test/fixtures/integration/liveStart30sBefore.js +++ b/test/fixtures/integration/liveStart30sBefore.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "segments": [ diff --git a/test/fixtures/integration/llhls.js b/test/fixtures/integration/llhls.js index 7614219..40ebba7 100644 --- a/test/fixtures/integration/llhls.js +++ b/test/fixtures/integration/llhls.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "dateTimeObject": new Date("2019-02-14T02:13:36.106Z"), "dateTimeString": "2019-02-14T02:13:36.106Z", diff --git a/test/fixtures/integration/llhlsDelta.js b/test/fixtures/integration/llhlsDelta.js index 4905c84..83c4d72 100644 --- a/test/fixtures/integration/llhlsDelta.js +++ b/test/fixtures/integration/llhlsDelta.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "dateTimeObject": new Date("2019-02-14T02:14:00.106Z"), "dateTimeString": "2019-02-14T02:14:00.106Z", diff --git a/test/fixtures/integration/manifestExtTTargetdurationNegative.js b/test/fixtures/integration/manifestExtTTargetdurationNegative.js index c5a1a75..6a5b632 100644 --- a/test/fixtures/integration/manifestExtTTargetdurationNegative.js +++ b/test/fixtures/integration/manifestExtTTargetdurationNegative.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "segments": [ diff --git a/test/fixtures/integration/manifestExtXEndlistEarly.js b/test/fixtures/integration/manifestExtXEndlistEarly.js index c07c585..d6fbaf9 100644 --- a/test/fixtures/integration/manifestExtXEndlistEarly.js +++ b/test/fixtures/integration/manifestExtXEndlistEarly.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "segments": [ diff --git a/test/fixtures/integration/manifestNoExtM3u.js b/test/fixtures/integration/manifestNoExtM3u.js index 649b282..b7b230b 100644 --- a/test/fixtures/integration/manifestNoExtM3u.js +++ b/test/fixtures/integration/manifestNoExtM3u.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "segments": [ diff --git a/test/fixtures/integration/master-fmp4.js b/test/fixtures/integration/master-fmp4.js index 727dd11..b41bb30 100644 --- a/test/fixtures/integration/master-fmp4.js +++ b/test/fixtures/integration/master-fmp4.js @@ -1,4 +1,4 @@ -{ +module.exports = { allowCache: true, discontinuityStarts: [], mediaGroups: { diff --git a/test/fixtures/integration/master.js b/test/fixtures/integration/master.js index 4a19ba4..7f93d3e 100644 --- a/test/fixtures/integration/master.js +++ b/test/fixtures/integration/master.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "playlists": [ { diff --git a/test/fixtures/integration/media.js b/test/fixtures/integration/media.js index 61dd5a5..a68c927 100644 --- a/test/fixtures/integration/media.js +++ b/test/fixtures/integration/media.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/mediaSequence.js b/test/fixtures/integration/mediaSequence.js index 026260a..cb2fa3c 100644 --- a/test/fixtures/integration/mediaSequence.js +++ b/test/fixtures/integration/mediaSequence.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/missingEndlist.js b/test/fixtures/integration/missingEndlist.js index ba0d7f5..32dee08 100644 --- a/test/fixtures/integration/missingEndlist.js +++ b/test/fixtures/integration/missingEndlist.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "segments": [ diff --git a/test/fixtures/integration/missingExtinf.js b/test/fixtures/integration/missingExtinf.js index 9be79a3..8dd1c79 100644 --- a/test/fixtures/integration/missingExtinf.js +++ b/test/fixtures/integration/missingExtinf.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/missingMediaSequence.js b/test/fixtures/integration/missingMediaSequence.js index 026260a..cb2fa3c 100644 --- a/test/fixtures/integration/missingMediaSequence.js +++ b/test/fixtures/integration/missingMediaSequence.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/missingSegmentDuration.js b/test/fixtures/integration/missingSegmentDuration.js index 4fde21e..e714112 100644 --- a/test/fixtures/integration/missingSegmentDuration.js +++ b/test/fixtures/integration/missingSegmentDuration.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/multipleAudioGroups.js b/test/fixtures/integration/multipleAudioGroups.js index bb905ab..185141c 100644 --- a/test/fixtures/integration/multipleAudioGroups.js +++ b/test/fixtures/integration/multipleAudioGroups.js @@ -1,4 +1,4 @@ -{ +module.exports = { allowCache: true, discontinuityStarts: [], mediaGroups: { diff --git a/test/fixtures/integration/multipleAudioGroupsCombinedMain.js b/test/fixtures/integration/multipleAudioGroupsCombinedMain.js index 72e85f5..09d6ee1 100644 --- a/test/fixtures/integration/multipleAudioGroupsCombinedMain.js +++ b/test/fixtures/integration/multipleAudioGroupsCombinedMain.js @@ -1,4 +1,4 @@ -{ +module.exports = { allowCache: true, discontinuityStarts: [], mediaGroups: { diff --git a/test/fixtures/integration/multipleTargetDurations.js b/test/fixtures/integration/multipleTargetDurations.js index ca191fc..68e60bc 100644 --- a/test/fixtures/integration/multipleTargetDurations.js +++ b/test/fixtures/integration/multipleTargetDurations.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "targetDuration": 10, diff --git a/test/fixtures/integration/multipleVideo.js b/test/fixtures/integration/multipleVideo.js index b536b88..8654ba1 100644 --- a/test/fixtures/integration/multipleVideo.js +++ b/test/fixtures/integration/multipleVideo.js @@ -1,4 +1,4 @@ -{ +module.exports = { allowCache: true, discontinuityStarts: [], mediaGroups: { diff --git a/test/fixtures/integration/negativeMediaSequence.js b/test/fixtures/integration/negativeMediaSequence.js index 9a56b33..04cf6e0 100644 --- a/test/fixtures/integration/negativeMediaSequence.js +++ b/test/fixtures/integration/negativeMediaSequence.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": -11, "playlistType": "VOD", diff --git a/test/fixtures/integration/playlist.js b/test/fixtures/integration/playlist.js index 5f9537b..a52e9f0 100644 --- a/test/fixtures/integration/playlist.js +++ b/test/fixtures/integration/playlist.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/playlistMediaSequenceHigher.js b/test/fixtures/integration/playlistMediaSequenceHigher.js index 3ea5973..db2398e 100644 --- a/test/fixtures/integration/playlistMediaSequenceHigher.js +++ b/test/fixtures/integration/playlistMediaSequenceHigher.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 17, "playlistType": "VOD", diff --git a/test/fixtures/integration/start.js b/test/fixtures/integration/start.js index 87f4722..7023b6c 100644 --- a/test/fixtures/integration/start.js +++ b/test/fixtures/integration/start.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/streamInfInvalid.js b/test/fixtures/integration/streamInfInvalid.js index 7bcca02..230e93c 100644 --- a/test/fixtures/integration/streamInfInvalid.js +++ b/test/fixtures/integration/streamInfInvalid.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "playlists": [ { diff --git a/test/fixtures/integration/twoMediaSequences.js b/test/fixtures/integration/twoMediaSequences.js index 6465911..ceae7d6 100644 --- a/test/fixtures/integration/twoMediaSequences.js +++ b/test/fixtures/integration/twoMediaSequences.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 11, "playlistType": "VOD", diff --git a/test/fixtures/integration/versionInvalid.js b/test/fixtures/integration/versionInvalid.js index 96f7b31..763d6a4 100644 --- a/test/fixtures/integration/versionInvalid.js +++ b/test/fixtures/integration/versionInvalid.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/whiteSpace.js b/test/fixtures/integration/whiteSpace.js index e210522..d8319b6 100644 --- a/test/fixtures/integration/whiteSpace.js +++ b/test/fixtures/integration/whiteSpace.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/fixtures/integration/zeroDuration.js b/test/fixtures/integration/zeroDuration.js index 36b9da3..6ff3372 100644 --- a/test/fixtures/integration/zeroDuration.js +++ b/test/fixtures/integration/zeroDuration.js @@ -1,4 +1,4 @@ -{ +module.exports = { "allowCache": true, "mediaSequence": 0, "playlistType": "VOD", diff --git a/test/parser.test.js b/test/parser.test.js index 946cb49..dc1efae 100644 --- a/test/parser.test.js +++ b/test/parser.test.js @@ -1,6 +1,6 @@ import QUnit from 'qunit'; -import testDataExpected from './dist/test-expected.js'; -import testDataManifests from './dist/test-manifests.js'; +import testDataExpected from 'data-files!expecteds'; +import testDataManifests from 'data-files!manifests'; import {Parser} from '../src'; QUnit.module('m3u8s', function(hooks) { @@ -421,12 +421,12 @@ QUnit.module('m3u8s', function(hooks) { throw new Error(`${key}.m3u8 does not have an equivelent expected js file to test against`); } QUnit.test(`parses ${key}.m3u8 as expected in ${key}.js`, function(assert) { - this.parser.push(testDataManifests[key]); + this.parser.push(testDataManifests[key]()); this.parser.end(); assert.deepEqual( this.parser.manifest, - testDataExpected[key], + testDataExpected[key](), key + '.m3u8 was parsed correctly' ); });