Skip to content

Commit

Permalink
add test for destroy() (katspaugh#1406)
Browse files Browse the repository at this point in the history
* update dev dependencies

* add test for destroy method
  • Loading branch information
thijstriemstra committed Aug 19, 2018
1 parent dc759de commit a497c33
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 28 deletions.
36 changes: 18 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,46 +39,46 @@
},
"devDependencies": {
"babel-core": "^6.26.3",
"babel-eslint": "^8.2.3",
"babel-loader": "^7.1.4",
"babel-eslint": "^8.2.6",
"babel-loader": "^7.1.5",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-plugin-istanbul": "^4.1.6",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-preset-env": "^1.7.0",
"babel-register": "^6.26.0",
"debounce": "^1.1.0",
"debounce": "^1.2.0",
"esdoc": "^1.1.0",
"esdoc-accessor-plugin": "^1.0.0",
"esdoc-brand-plugin": "^1.0.1",
"esdoc-coverage-plugin": "^1.1.0",
"esdoc-ecmascript-proposal-plugin": "^1.0.0",
"esdoc-integrate-test-plugin": "^1.0.0",
"esdoc-standard-plugin": "^1.0.0",
"eslint": "^4.19.1",
"eslint-config-prettier": "^2.9.0",
"eslint-loader": "^2.0.0",
"eslint-plugin-prettier": "^2.6.0",
"eslint": "^5.4.0",
"eslint-config-prettier": "^3.0.1",
"eslint-loader": "^2.1.0",
"eslint-plugin-prettier": "^2.6.2",
"htmlhint": "^0.9.13",
"in-publish": "^2.0.0",
"jasmine-core": "^3.1.0",
"karma": "^2.0.2",
"jasmine-core": "^3.2.1",
"karma": "^3.0.0",
"karma-chrome-launcher": "2.2.0",
"karma-coverage": "^1.1.2",
"karma-coveralls": "^1.2.1",
"karma-coveralls": "^2.0.0",
"karma-firefox-launcher": "^1.1.0",
"karma-jasmine": "1.1.2",
"karma-jasmine-matchers": "3.7.0",
"karma-jasmine-matchers": "3.8.3",
"karma-verbose-reporter": "0.0.6",
"karma-webpack": "^3.0.0",
"lint-staged": "^7.2.0",
"karma-webpack": "^4.0.0-beta.0",
"lint-staged": "^7.2.2",
"load-script": "^1.0.0",
"pre-commit": "^1.2.2",
"prettier": "^1.13.5",
"uglifyjs-webpack-plugin": "^1.2.5",
"webpack": "^4.12.0",
"webpack-cli": "^3.0.6",
"prettier": "^1.14.2",
"uglifyjs-webpack-plugin": "^1.3.0",
"webpack": "^4.16.5",
"webpack-cli": "^3.1.0",
"webpack-dev-server": "3",
"webpack-merge": "^4.1.3"
"webpack-merge": "^4.1.4"
},
"homepage": "https://github.com/katspaugh/wavesurfer.js",
"pre-commit": "lint-and-format-staged",
Expand Down
10 changes: 5 additions & 5 deletions spec/test-helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ const TestHelpers = {

createElement(id, type) {
if (id == undefined) {
id = 'waveform';
id = 'waveform_' + WaveSurfer.util.getId();
}
if (type == undefined) {
type = 'div';
}
var element = document.createElement(type);
let element = document.createElement(type);
element.id = id;
document.getElementsByTagName('body')[0].appendChild(element);

Expand All @@ -31,15 +31,15 @@ const TestHelpers = {
* @param {Object} options
*/
createWaveform(options) {
this.createElement('waveform');
let element = this.createElement();

options = options || {
container: '#waveform',
container: element,
waveColor: '#90F09B',
progressColor: 'purple',
cursorColor: 'white'
};
return WaveSurfer.create(options);
return [WaveSurfer.create(options), element];
}
};

Expand Down
26 changes: 21 additions & 5 deletions spec/wavesurfer.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,25 @@ import TestHelpers from './test-helpers.js';
/** @test {WaveSurfer} */
describe('WaveSurfer/playback:', function() {
var wavesurfer;
var element;
var manualDestroy = false;

jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000;

beforeEach(function(done) {
wavesurfer = TestHelpers.createWaveform();
var wave = TestHelpers.createWaveform();
wavesurfer = wave[0];
element = wave[1];
wavesurfer.load(TestHelpers.EXAMPLE_FILE_PATH);

wavesurfer.on('ready', function() {
done();
});
wavesurfer.on('ready', done);
});

afterEach(function() {
wavesurfer.destroy();
if (!manualDestroy) {
wavesurfer.destroy();
TestHelpers.removeElement(element);
}
});

/**
Expand Down Expand Up @@ -283,6 +288,17 @@ describe('WaveSurfer/playback:', function() {
var imgData = wavesurfer.exportImage();
expect(imgData).toBeNonEmptyString();
});

/** @test {WaveSurfer#destroy} */
it('should destroy', function(done) {
manualDestroy = true;

wavesurfer.once('destroy', function() {
TestHelpers.removeElement(element);
done();
});
wavesurfer.destroy();
});
});

/** @test {WaveSurfer} */
Expand Down

0 comments on commit a497c33

Please sign in to comment.