Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix intermittently failing video js tests

Browse Source
This commit is contained in:
Jay Zoldak
2013-10-09 15:16:32 -04:00
parent b5f1d99829
commit ac4ac23d25
2 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/lib/xmodule/xmodule/js/spec/helper.coffee
View File

@@ -58,7 +58,7 @@ window.jQuery.ajaxWithPrefix = (url, settings) ->
oldAjaxWithPrefix.apply @, arguments
# Time waitsFor() should wait for before failing a test.
window.WAIT_TIMEOUT = 1000
window.WAIT_TIMEOUT = 5000
jasmine.getFixtures().fixturesPath += 'fixtures'

67
common/lib/xmodule/xmodule/js/spec/video/html5_video_spec.js
View File

@@ -16,7 +16,7 @@
});
afterEach(function() {
YT.Player = void 0;
state = undefined;
$.fn.scrollTo.reset();
$('.subtitles').remove();
$('source').remove();
@@ -40,10 +40,7 @@
expect(player.video.play).toHaveBeenCalled();
});
// Temporarily disabled due to intermittent failures
// Fails with "timeout: timed out after 1000 msec waiting for Player state should be changed"
// on Firefox
xit('player state was changed', function () {
it('player state was changed', function () {
waitsFor(function () {
return player.getPlayerState() !== STATUS.PAUSED;
}, 'Player state should be changed', WAIT_TIMEOUT);
@@ -63,36 +60,36 @@
});
});
});
});
describe('when player is played', function () {
beforeEach(function () {
spyOn(player.video, 'pause').andCallThrough();
player.playerState = STATUS.PLAYING;
$(player.videoEl).trigger('click');
});
it('native event was called', function () {
expect(player.video.pause).toHaveBeenCalled();
});
it('player state was changed', function () {
waitsFor(function () {
return player.getPlayerState() !== STATUS.PLAYING;
}, 'Player state should be changed', WAIT_TIMEOUT);
runs(function () {
expect(player.getPlayerState()).toBe(STATUS.PAUSED);
describe('when player is playing', function () {
beforeEach(function () {
spyOn(player.video, 'pause').andCallThrough();
player.playerState = STATUS.PLAYING;
$(player.videoEl).trigger('click');
});
});
it('callback was called', function () {
waitsFor(function () {
return player.getPlayerState() !== STATUS.PLAYING;
}, 'Player state should be changed', WAIT_TIMEOUT);
it('native event was called', function () {
expect(player.video.pause).toHaveBeenCalled();
});
runs(function () {
expect(player.callStateChangeCallback).toHaveBeenCalled();
it('player state was changed', function () {
waitsFor(function () {
return player.getPlayerState() !== STATUS.PLAYING;
}, 'Player state should be changed', WAIT_TIMEOUT);
runs(function () {
expect(player.getPlayerState()).toBe(STATUS.PAUSED);
});
});
it('callback was called', function () {
waitsFor(function () {
return player.getPlayerState() !== STATUS.PLAYING;
}, 'Player state should be changed', WAIT_TIMEOUT);
runs(function () {
expect(player.callStateChangeCallback).toHaveBeenCalled();
});
});
});
});
@@ -132,7 +129,11 @@
describe('pause', function () {
beforeEach(function () {
spyOn(player.video, 'pause').andCallThrough();
player.playerState = STATUS.UNSTARTED;
player.playVideo();
waitsFor(function () {
return player.getPlayerState() !== STATUS.UNSTARTED;
}, 'Video never started playing', WAIT_TIMEOUT);
player.pauseVideo();
});
@@ -142,7 +143,7 @@
it('player state was changed', function () {
waitsFor(function () {
return player.getPlayerState() !== STATUS.UNSTARTED;
return player.getPlayerState() !== STATUS.PLAYING;
}, 'Player state should be changed', WAIT_TIMEOUT);
runs(function () {
@@ -152,7 +153,7 @@
it('callback was called', function () {
waitsFor(function () {
return player.getPlayerState() !== STATUS.UNSTARTED;
return player.getPlayerState() !== STATUS.PLAYING;
}, 'Player state should be changed', WAIT_TIMEOUT);
runs(function () {
expect(player.callStateChangeCallback).toHaveBeenCalled();