c84a41cb by Gary Katsevman

Fix bandwidth test.

Also, update phantom.

Conflicts:
	src/videojs-hls.js
1 parent 5aec30b9
......@@ -29,10 +29,11 @@
"karma-firefox-launcher": "~0.1.3",
"karma-ie-launcher": "~0.1.1",
"karma-opera-launcher": "~0.1.0",
"karma-phantomjs-launcher": "~0.1.1",
"karma-phantomjs-launcher": "^0.1.4",
"karma-qunit": "~0.1.1",
"karma-safari-launcher": "~0.1.1",
"karma-sauce-launcher": "~0.1.8",
"qunitjs": "^1.15.0",
"sinon": "1.10.2",
"video.js": "^4.7.2"
},
......
......@@ -385,6 +385,10 @@ test('calculates the bandwidth after downloading a segment', function() {
openMediaSource(player);
standardXHRResponse(requests[0]);
// set the request time to be a bit earlier so our bandwidth calculations are NaN
requests[1].requestTime = (new Date())-100;
standardXHRResponse(requests[1]);
ok(player.hls.bandwidth, 'bandwidth is calculated');
......