c84a41cb by Gary Katsevman

Fix bandwidth test.

Also, update phantom.

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