From 53210b254627942deadad8e0923175a8c1a5ae86 Mon Sep 17 00:00:00 2001
From: jrivera <jrivera@brightcove.com>
Date: Wed, 16 Dec 2015 14:23:39 -0500
Subject: [PATCH] Fix tests readyState should have been a function all along
 added a test for expired seconds tracking not beginning until firstplay is
 triggered

---
 test/playlist-loader_test.js | 33 +++++++++++++++++++++++++++++++++
 test/videojs-hls_test.js     | 10 +++++-----
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/test/playlist-loader_test.js b/test/playlist-loader_test.js
index b75ef92c..e7adf998 100644
--- a/test/playlist-loader_test.js
+++ b/test/playlist-loader_test.js
@@ -177,8 +177,37 @@
     strictEqual(loader.state, 'HAVE_METADATA', 'the state is correct');
   });
 
+  test('does not increment expired seconds before firstplay is triggered', function() {
+    var loader = new videojs.Hls.PlaylistLoader('live.m3u8');
+    requests.pop().respond(200, null,
+                           '#EXTM3U\n' +
+                           '#EXT-X-MEDIA-SEQUENCE:0\n' +
+                           '#EXTINF:10,\n' +
+                           '0.ts\n' +
+                           '#EXTINF:10,\n' +
+                           '1.ts\n' +
+                           '#EXTINF:10,\n' +
+                           '2.ts\n' +
+                           '#EXTINF:10,\n' +
+                           '3.ts\n');
+    clock.tick(10 * 1000); // 10s, one target duration
+    requests.pop().respond(200, null,
+                           '#EXTM3U\n' +
+                           '#EXT-X-MEDIA-SEQUENCE:1\n' +
+                           '#EXTINF:10,\n' +
+                           '1.ts\n' +
+                           '#EXTINF:10,\n' +
+                           '2.ts\n' +
+                           '#EXTINF:10,\n' +
+                           '3.ts\n' +
+                           '#EXTINF:10,\n' +
+                           '4.ts\n');
+    equal(loader.expired_, 0, 'expired one segment');
+  });
+
   test('increments expired seconds after a segment is removed', function() {
     var loader = new videojs.Hls.PlaylistLoader('live.m3u8');
+    loader.trigger('firstplay');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXT-X-MEDIA-SEQUENCE:0\n' +
@@ -207,6 +236,7 @@
 
   test('increments expired seconds after a discontinuity', function() {
     var loader = new videojs.Hls.PlaylistLoader('live.m3u8');
+    loader.trigger('firstplay');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXT-X-MEDIA-SEQUENCE:0\n' +
@@ -249,6 +279,7 @@
 
   test('tracks expired seconds properly when two discontinuities expire at once', function() {
     var loader = new videojs.Hls.PlaylistLoader('live.m3u8');
+    loader.trigger('firstplay');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXT-X-MEDIA-SEQUENCE:0\n' +
@@ -274,6 +305,7 @@
 
   test('estimates expired if an entire window elapses between live playlist updates', function() {
     var loader = new videojs.Hls.PlaylistLoader('live.m3u8');
+    loader.trigger('firstplay');
     requests.pop().respond(200, null,
                            '#EXTM3U\n' +
                            '#EXT-X-MEDIA-SEQUENCE:0\n' +
@@ -826,6 +858,7 @@
 
   test('prefers precise segment timing when tracking expired time', function() {
     var loader = new videojs.Hls.PlaylistLoader('media.m3u8');
+    loader.trigger('firstplay');
     requests.shift().respond(200, null,
                              '#EXTM3U\n' +
                              '#EXT-X-MEDIA-SEQUENCE:1001\n' +
diff --git a/test/videojs-hls_test.js b/test/videojs-hls_test.js
index 225d4f64..0afc444c 100644
--- a/test/videojs-hls_test.js
+++ b/test/videojs-hls_test.js
@@ -335,7 +335,7 @@ test('autoplay seeks to the live point after playlist load', function() {
     type: 'application/vnd.apple.mpegurl'
   });
   openMediaSource(player);
-  player.tech_.readyState = 3;
+  player.tech_.readyState = function(){return 1;};
   player.tech_.trigger('play');
   standardXHRResponse(requests.shift());
   clock.tick(1);
@@ -357,7 +357,7 @@ test('autoplay seeks to the live point after media source open', function() {
   clock.tick(1);
   standardXHRResponse(requests.shift());
   openMediaSource(player);
-  player.tech_.readyState = 3;
+  player.tech_.readyState = function(){return 1;};
   player.tech_.trigger('play');
   clock.tick(1);
 
@@ -410,7 +410,7 @@ test('calls `remove` on sourceBuffer to when loading a live segment', function()
   player.tech_.hls.playlists.trigger('loadedmetadata');
   player.tech_.trigger('canplay');
   player.tech_.paused = function() { return false; };
-  player.tech_.readyState = 3;
+  player.tech_.readyState = function(){return 1;};
   player.tech_.trigger('play');
 
   clock.tick(1);
@@ -1688,7 +1688,7 @@ test('live playlist starts three target durations before live', function() {
   equal(requests.length, 0, 'no outstanding segment request');
 
   player.tech_.paused = function() { return false; };
-  player.tech_.readyState = 3;
+  player.tech_.readyState = function(){return 1;};
   player.tech_.trigger('play');
   clock.tick(1);
   mediaPlaylist = player.tech_.hls.playlists.media();
@@ -1709,7 +1709,7 @@ test('live playlist starts with correct currentTime value', function() {
   player.tech_.hls.playlists.trigger('loadedmetadata');
 
   player.tech_.paused = function() { return false; };
-  player.tech_.readyState = 3;
+  player.tech_.readyState = function(){return 1;};
   player.tech_.trigger('play');
   clock.tick(1);