Style fixes and restoring some command ordering

The refactor should not have changed the required ordering for statements so restore it. Adjust styles a tad.

@@ -91,7 +91,7 @@ Hls.findSoleUncommonTimeRangesEnd_ = function(original, update) {
 /**
 /**
  * Whether the browser has built-in HLS support.
  * Whether the browser has built-in HLS support.
  */
  */
-Hls.supportsNativeHls = function() {
+Hls.supportsNativeHls = (function() {
   let video = document.createElement('video');
   let video = document.createElement('video');
   let xMpegUrl;
   let xMpegUrl;
   let vndMpeg;
   let vndMpeg;
@@ -105,7 +105,7 @@ Hls.supportsNativeHls = function() {
   vndMpeg = video.canPlayType('application/vnd.apple.mpegURL');
   vndMpeg = video.canPlayType('application/vnd.apple.mpegURL');
   return (/probably|maybe/).test(xMpegUrl) ||
   return (/probably|maybe/).test(xMpegUrl) ||
     (/probably|maybe/).test(vndMpeg);
     (/probably|maybe/).test(vndMpeg);
-};
+}());
 
 
 // HLS is a source handler, not a tech. Make sure attempts to use it
 // HLS is a source handler, not a tech. Make sure attempts to use it
 // as one do not cause exceptions.
 // as one do not cause exceptions.
@@ -717,6 +717,7 @@ export default class HlsHandler extends Component {
     let variant;
     let variant;
     let bandwidthBestVariant;
     let bandwidthBestVariant;
     let resolutionPlusOne;
     let resolutionPlusOne;
+    let resolutionPlusOneAttribute;
     let resolutionBestVariant;
     let resolutionBestVariant;
     let width;
     let width;
     let height;
     let height;
@@ -725,9 +726,9 @@ export default class HlsHandler extends Component {
 
 
     // filter out any playlists that have been excluded due to
     // filter out any playlists that have been excluded due to
     // incompatible configurations or playback errors
     // incompatible configurations or playback errors
-    sortedPlaylists = sortedPlaylists.filter((localvariant) => {
-      if (typeof localvariant.excludeUntil !== 'undefined') {
-        return now >= localvariant.excludeUntil;
+    sortedPlaylists = sortedPlaylists.filter((localVariant) => {
+      if (typeof localVariant.excludeUntil !== 'undefined') {
+        return now >= localVariant.excludeUntil;
       }
       }
       return true;
       return true;
     });
     });
@@ -785,21 +786,22 @@ export default class HlsHandler extends Component {
       // since the playlists are sorted, the first variant that has
       // since the playlists are sorted, the first variant that has
       // dimensions less than or equal to the player size is the best
       // dimensions less than or equal to the player size is the best
 
 
-      if (variant.attributes.RESOLUTION.width === width &&
-          variant.attributes.RESOLUTION.height === height) {
+      let variantResolution = variant.attributes.RESOLUTION;
+
+      if (variantResolution.width === width &&
+          variantResolution.height === height) {
         // if we have the exact resolution as the player use it
         // if we have the exact resolution as the player use it
         resolutionPlusOne = null;
         resolutionPlusOne = null;
         resolutionBestVariant = variant;
         resolutionBestVariant = variant;
         break;
         break;
-      } else if (variant.attributes.RESOLUTION.width < width &&
-        variant.attributes.RESOLUTION.height < height) {
+      } else if (variantResolution.width < width &&
+                 variantResolution.height < height) {
         // if both dimensions are less than the player use the
         // if both dimensions are less than the player use the
         // previous (next-largest) variant
         // previous (next-largest) variant
         break;
         break;
-      } else if (!resolutionPlusOne || (variant.attributes.RESOLUTION.width <
-                                        resolutionPlusOne.attributes.RESOLUTION.width &&
-                                        variant.attributes.RESOLUTION.height <
-                                        resolutionPlusOne.attributes.RESOLUTION.height)) {
+      } else if (!resolutionPlusOne ||
+                 (variantResolution.width < resolutionPlusOneAttribute.width &&
+                  variantResolution.height < resolutionPlusOneAttribute.height)) {
         // If we still haven't found a good match keep a
         // If we still haven't found a good match keep a
         // reference to the previous variant for the next loop
         // reference to the previous variant for the next loop
         // iteration
         // iteration
@@ -809,6 +811,7 @@ export default class HlsHandler extends Component {
         // the highest bandwidth variant that is just-larger-than
         // the highest bandwidth variant that is just-larger-than
         // the video player
         // the video player
         resolutionPlusOne = variant;
         resolutionPlusOne = variant;
+        resolutionPlusOneAttribute = resolutionPlusOneAttribute.attributes.RESOLUTION;
       }
       }
     }
     }
 
 
@@ -930,12 +933,13 @@ export default class HlsHandler extends Component {
 
 
     // we have entered a state where we are fetching the same segment,
     // we have entered a state where we are fetching the same segment,
     // try to walk forward
     // try to walk forward
+    /* eslint-disable max-len */
     if (this.lastSegmentLoaded_ &&
     if (this.lastSegmentLoaded_ &&
-        this.playlistUriToUrl(this.lastSegmentLoaded_.uri) ===
-        this.playlistUriToUrl(segment.uri) &&
+        this.playlistUriToUrl(this.lastSegmentLoaded_.uri) === this.playlistUriToUrl(segment.uri) &&
         this.lastSegmentLoaded_.byterange === segment.byterange) {
         this.lastSegmentLoaded_.byterange === segment.byterange) {
       return this.fillBuffer(mediaIndex + 1);
       return this.fillBuffer(mediaIndex + 1);
     }
     }
+    /* eslint-enable max-len */
 
 
     // package up all the work to append the segment
     // package up all the work to append the segment
     segmentInfo = {
     segmentInfo = {
@@ -1236,9 +1240,9 @@ export default class HlsHandler extends Component {
       decrypter = new Hls.Decrypter(segmentInfo.encryptedBytes,
       decrypter = new Hls.Decrypter(segmentInfo.encryptedBytes,
                                     segment.key.bytes,
                                     segment.key.bytes,
                                     segIv,
                                     segIv,
-                                    function(err, localBytes) {
-                                      if (err) {
-                                        throw new Error(err);
+                                    function(error, localBytes) {
+                                      if (error) {
+                                        videojs.log.warn(error);
                                       }
                                       }
                                       segmentInfo.bytes = localBytes;
                                       segmentInfo.bytes = localBytes;
                                     });
                                     });
@@ -1415,10 +1419,10 @@ export default class HlsHandler extends Component {
  * @return a new TimeRanges object.
  * @return a new TimeRanges object.
  */
  */
 HlsHandler.prototype.findBufferedRange_ =
 HlsHandler.prototype.findBufferedRange_ =
-filterBufferedRanges(function(start, end, time) {
-  return start - TIME_FUDGE_FACTOR <= time &&
-         end + TIME_FUDGE_FACTOR >= time;
-});
+  filterBufferedRanges(function(start, end, time) {
+    return start - TIME_FUDGE_FACTOR <= time &&
+      end + TIME_FUDGE_FACTOR >= time;
+  });
 /**
 /**
  * Returns the TimeRanges that begin at or later than the specified
  * Returns the TimeRanges that begin at or later than the specified
  * time.
  * time.
@@ -1427,9 +1431,9 @@ filterBufferedRanges(function(start, end, time) {
  * @return a new TimeRanges object.
  * @return a new TimeRanges object.
  */
  */
 HlsHandler.prototype.findNextBufferedRange_ =
 HlsHandler.prototype.findNextBufferedRange_ =
-filterBufferedRanges(function(start, end, time) {
-  return start - TIME_FUDGE_FACTOR >= time;
-});
+  filterBufferedRanges(function(start, end, time) {
+    return start - TIME_FUDGE_FACTOR >= time;
+  });
 
 
 /**
 /**
  * The Source Handler object, which informs video.js what additional
  * The Source Handler object, which informs video.js what additional
@@ -1468,7 +1472,7 @@ HlsSourceHandler.canPlayType = function(type) {
   let mpegurlRE = /^application\/(?:x-|vnd\.apple\.)mpegurl/i;
   let mpegurlRE = /^application\/(?:x-|vnd\.apple\.)mpegurl/i;
 
 
   // favor native HLS support if it's available
   // favor native HLS support if it's available
-  if (Hls.supportsNativeHls()) {
+  if (Hls.supportsNativeHls) {
     return false;
     return false;
   }
   }
   return mpegurlRE.test(type);
   return mpegurlRE.test(type);

+/* eslint-disable max-len */
+
 import document from 'global/document';
 import document from 'global/document';
 import videojs from 'video.js';
 import videojs from 'video.js';
 import sinon from 'sinon';
 import sinon from 'sinon';
@@ -8,7 +10,6 @@ import testDataManifests from './test-manifests.js';
 import Hls from '../src/videojs-contrib-hls';
 import Hls from '../src/videojs-contrib-hls';
 /* eslint-enable no-unused-vars */
 /* eslint-enable no-unused-vars */
 
 
-const bcSegment = new Uint8Array(1);
 const Flash = videojs.getComponent('Flash');
 const Flash = videojs.getComponent('Flash');
 let nextId = 0;
 let nextId = 0;
 
 
@@ -25,10 +26,9 @@ const mockTech = function(tech) {
   }
   }
 
 
   tech.isMocked_ = true;
   tech.isMocked_ = true;
-
-  tech.hls = tech.hls;
   tech.src_ = null;
   tech.src_ = null;
   tech.time_ = null;
   tech.time_ = null;
+
   tech.paused_ = !tech.autoplay();
   tech.paused_ = !tech.autoplay();
   tech.paused = function() {
   tech.paused = function() {
     return tech.paused_;
     return tech.paused_;
@@ -102,11 +102,12 @@ const createPlayer = function(options) {
 };
 };
 
 
 const openMediaSource = function(player, clock) {
 const openMediaSource = function(player, clock) {
-  mockTech(player.tech_);
-
   // ensure the Flash tech is ready
   // ensure the Flash tech is ready
   player.tech_.triggerReady();
   player.tech_.triggerReady();
   clock.tick(1);
   clock.tick(1);
+  // mock the tech *after* it has finished loading so that we don't
+  // mock a tech that will be unloaded on the next tick
+  mockTech(player.tech_);
 
 
   // simulate the sourceopen event
   // simulate the sourceopen event
   player.tech_.hls.mediaSource.readyState = 'open';
   player.tech_.hls.mediaSource.readyState = 'open';
@@ -162,14 +163,19 @@ const absoluteUrl = function(relativeUrl) {
         .join('/')
         .join('/')
     );
     );
 };
 };
+
 // a no-op MediaSource implementation to allow synchronous testing
 // a no-op MediaSource implementation to allow synchronous testing
-const MockMediaSource = videojs.extend(videojs.EventTarget, {
-  constructor() {},
-  duration: NaN,
-  seekable: videojs.createTimeRange(),
+class MockMediaSource extends videojs.EventTarget {
+  static open() {}
+
+  constructor() {
+    super();
+    this.duration = NaN;
+    this.seekable = videojs.createTimeRange();
+  }
   addSeekableRange_(start, end) {
   addSeekableRange_(start, end) {
     this.seekable = videojs.createTimeRange(start, end);
     this.seekable = videojs.createTimeRange(start, end);
-  },
+  }
   addSourceBuffer() {
   addSourceBuffer() {
     return new (videojs.extend(videojs.EventTarget, {
     return new (videojs.extend(videojs.EventTarget, {
       constructor() {},
       constructor() {},
@@ -178,13 +184,12 @@ const MockMediaSource = videojs.extend(videojs.EventTarget, {
       appendBuffer() {},
       appendBuffer() {},
       remove() {}
       remove() {}
     }))();
     }))();
-  },
+  }
   // endOfStream triggers an exception if flash isn't available
   // endOfStream triggers an exception if flash isn't available
   endOfStream(error) {
   endOfStream(error) {
     this.error_ = error;
     this.error_ = error;
-  },
-  open() {}
-});
+  }
+}
 const URL = {
 const URL = {
   createObjectURL() {
   createObjectURL() {
     return 'blob:mock-vjs-object-url';
     return 'blob:mock-vjs-object-url';
@@ -193,15 +198,14 @@ const URL = {
 
 
 QUnit.module('HLS -', {
 QUnit.module('HLS -', {
   beforeEach() {
   beforeEach() {
-    // Mock the environment's timers because certain things - particularly
-    // player readiness - are asynchronous in video.js 5.
-    this.clock = sinon.useFakeTimers();
-
-    // setup a player
-    this.player = createPlayer();
-
     this.old = {};
     this.old = {};
 
 
+    // Mock Media Sources
+    this.old.MediaSource = videojs.MediaSource;
+    videojs.MediaSource = MockMediaSource;
+    this.old.URL = videojs.URL;
+    videojs.URL = URL;
+
     // mock out Flash features for phantomjs
     // mock out Flash features for phantomjs
     this.old.Flash = videojs.mergeOptions({}, Flash);
     this.old.Flash = videojs.mergeOptions({}, Flash);
     /* eslint-disable camelcase */
     /* eslint-disable camelcase */
@@ -242,17 +246,6 @@ QUnit.module('HLS -', {
       return true;
       return true;
     };
     };
 
 
-    // fake XHRs
-    this.old.XHR = videojs.xhr.XMLHttpRequest;
-    this.sinonXHR = sinon.useFakeXMLHttpRequest();
-    this.requests = [];
-    this.sinonXHR.onCreate = (xhr) => {
-      // force the XHR2 timeout polyfill
-      xhr.timeout = null;
-      this.requests.push(xhr);
-    };
-    videojs.xhr.XMLHttpRequest = this.sinonXHR;
-
     // Fake sourcebuffer
     // Fake sourcebuffer
     this.old.SourceBuffer = window.videojs.SourceBuffer;
     this.old.SourceBuffer = window.videojs.SourceBuffer;
     window.videojs.SourceBuffer = function() {
     window.videojs.SourceBuffer = function() {
@@ -265,28 +258,31 @@ QUnit.module('HLS -', {
 
 
     // force the HLS tech to run
     // force the HLS tech to run
     this.old.NativeHlsSupport = videojs.Hls.supportsNativeHls;
     this.old.NativeHlsSupport = videojs.Hls.supportsNativeHls;
-    videojs.Hls.supportsNativeHls = function() {
-      return false;
-    };
+    videojs.Hls.supportsNativeHls = false;
 
 
     this.old.Decrypt = videojs.Hls.Decrypter;
     this.old.Decrypt = videojs.Hls.Decrypter;
     videojs.Hls.Decrypter = function() {};
     videojs.Hls.Decrypter = function() {};
 
 
-    // Mock Media Sources
-    this.old.MediaSource = videojs.MediaSource;
-    videojs.MediaSource = MockMediaSource;
-    this.old.URL = videojs.URL;
-    videojs.URL = URL;
+    // fake XHRs
+    this.old.XHR = videojs.xhr.XMLHttpRequest;
+    this.sinonXHR = sinon.useFakeXMLHttpRequest();
+    this.requests = [];
+    this.sinonXHR.onCreate = (xhr) => {
+      // force the XHR2 timeout polyfill
+      xhr.timeout = null;
+      this.requests.push(xhr);
+    };
+    videojs.xhr.XMLHttpRequest = this.sinonXHR;
+
+    // Mock the environment's timers because certain things - particularly
+    // player readiness - are asynchronous in video.js 5.
+    this.clock = sinon.useFakeTimers();
+
+    // setup a player
+    this.player = createPlayer();
   },
   },
 
 
   afterEach() {
   afterEach() {
-    // The clock _must_ be restored before disposing the player; otherwise,
-    // certain timeout listeners that happen inside video.js may throw errors.
-    this.clock.restore();
-    this.player.dispose();
-
-    this.sinonXHR.restore();
-    videojs.xhr.XMLHttpRequest = this.old.XHR;
     videojs.MediaSource = this.old.MediaSource;
     videojs.MediaSource = this.old.MediaSource;
     videojs.URL = this.old.URL;
     videojs.URL = this.old.URL;
 
 
@@ -297,6 +293,16 @@ QUnit.module('HLS -', {
     videojs.Hls.supportsNativeHls = this.old.NativeHlsSupport;
     videojs.Hls.supportsNativeHls = this.old.NativeHlsSupport;
     videojs.Hls.Decrypter = this.old.Decrypt;
     videojs.Hls.Decrypter = this.old.Decrypt;
     videojs.SourceBuffer = this.old.SourceBuffer;
     videojs.SourceBuffer = this.old.SourceBuffer;
+
+    // The clock _must_ be restored before disposing the player; otherwise,
+    // certain timeout listeners that happen inside video.js may throw errors.
+    this.clock.restore();
+    // XXX TODO WHY!?!?!?
+    this.player.dispose();
+
+    this.sinonXHR.restore();
+    videojs.xhr.XMLHttpRequest = this.old.XHR;
+
   }
   }
 });
 });
 
 
@@ -308,9 +314,7 @@ QUnit.test('starts playing if autoplay is specified', function() {
     src: 'manifest/playlist.m3u8',
     src: 'manifest/playlist.m3u8',
     type: 'application/vnd.apple.mpegurl'
     type: 'application/vnd.apple.mpegurl'
   });
   });
-  // REMOVEME workaround https://github.com/videojs/video.js/issues/2326
-  // this.player.tech_.triggerReady();
-  // this.clock.tick(1);
+
   // make sure play() is called *after* the media source opens
   // make sure play() is called *after* the media source opens
   this.player.tech_.hls.play = function() {
   this.player.tech_.hls.play = function() {
     plays++;
     plays++;
@@ -417,8 +421,7 @@ QUnit.test('autoplay seeks to the live point after media source open', function(
   QUnit.notEqual(currentTime, 0, 'seeked on autoplay');
   QUnit.notEqual(currentTime, 0, 'seeked on autoplay');
 });
 });
 
 
-QUnit.test('duration is set when the source opens after the playlist is loaded',
-function() {
+QUnit.test('duration is set when the source opens after the playlist is loaded', function() {
   this.player.src({
   this.player.src({
     src: 'media.m3u8',
     src: 'media.m3u8',
     type: 'application/vnd.apple.mpegurl'
     type: 'application/vnd.apple.mpegurl'
@@ -527,11 +530,8 @@ QUnit.test('codecs are passed to the source buffer', function() {
     type: 'application/vnd.apple.mpegurl'
     type: 'application/vnd.apple.mpegurl'
   });
   });
   openMediaSource(this.player, this.clock);
   openMediaSource(this.player, this.clock);
-  let addSourceBuffer = this.player.tech_.hls.mediaSource.addSourceBuffer;
-
   this.player.tech_.hls.mediaSource.addSourceBuffer = function(codec) {
   this.player.tech_.hls.mediaSource.addSourceBuffer = function(codec) {
     codecs.push(codec);
     codecs.push(codec);
-    return addSourceBuffer.call(this, codec);
   };
   };
 
 
   this.requests.shift().respond(200, null,
   this.requests.shift().respond(200, null,
@@ -920,7 +920,7 @@ QUnit.test('buffer checks are noops when only the master is ready', function() {
   standardXHRResponse(this.requests.shift());
   standardXHRResponse(this.requests.shift());
   // media
   // media
   standardXHRResponse(this.requests.shift());
   standardXHRResponse(this.requests.shift());
-  // ignore any outstanding segmentthis.requests
+  // ignore any outstanding segment requests
   this.requests.length = 0;
   this.requests.length = 0;
 
 
   // load in a new playlist which will cause playlists.media() to be
   // load in a new playlist which will cause playlists.media() to be
@@ -1083,7 +1083,7 @@ QUnit.test('downloads additional playlists if required', function() {
   this.requests[2].respond(200, null, '');
   this.requests[2].respond(200, null, '');
   standardXHRResponse(this.requests[3]);
   standardXHRResponse(this.requests[3]);
 
 
-  QUnit.strictEqual(4, this.requests.length, 'this.requestswere made');
+  QUnit.strictEqual(4, this.requests.length, 'requests were made');
   QUnit.strictEqual(this.requests[3].url,
   QUnit.strictEqual(this.requests[3].url,
                     absoluteUrl('manifest/' + playlist.uri),
                     absoluteUrl('manifest/' + playlist.uri),
                     'made playlist request');
                     'made playlist request');
@@ -1200,7 +1200,7 @@ QUnit.test('selects the correct rendition by player dimensions', function() {
 
 
   QUnit.deepEqual(playlist.attributes.RESOLUTION,
   QUnit.deepEqual(playlist.attributes.RESOLUTION,
                   {width: 960, height: 540},
                   {width: 960, height: 540},
-                  'should return the correct resolution by playerdimensions');
+                  'should return the correct resolution by player dimensions');
   QUnit.equal(playlist.attributes.BANDWIDTH,
   QUnit.equal(playlist.attributes.BANDWIDTH,
               1928000,
               1928000,
               'should have the expected bandwidth in case of multiple');
               'should have the expected bandwidth in case of multiple');
@@ -1227,7 +1227,7 @@ QUnit.test('selects the correct rendition by player dimensions', function() {
   QUnit.deepEqual(playlist.attributes.RESOLUTION,
   QUnit.deepEqual(playlist.attributes.RESOLUTION,
                   {width: 396, height: 224},
                   {width: 396, height: 224},
                   'should return the correct resolution by ' +
                   'should return the correct resolution by ' +
-                  'this.playerdimensions, if exact match');
+                  'player dimensions, if exact match');
   QUnit.equal(playlist.attributes.BANDWIDTH,
   QUnit.equal(playlist.attributes.BANDWIDTH,
               440000,
               440000,
               'should have the expected bandwidth in case of multiple, if exact match');
               'should have the expected bandwidth in case of multiple, if exact match');
@@ -1245,7 +1245,7 @@ QUnit.test('selects the correct rendition by player dimensions', function() {
               'should have the expected bandwidth in case of multiple, if exact match');
               'should have the expected bandwidth in case of multiple, if exact match');
 });
 });
 
 
-QUnit.test('selects the highest bitrate playlist when the this.playerdimensions are ' +
+QUnit.test('selects the highest bitrate playlist when the player dimensions are ' +
      'larger than any of the variants', function() {
      'larger than any of the variants', function() {
   let playlist;
   let playlist;
 
 
@@ -1396,9 +1396,7 @@ QUnit.test('blacklists switching from video-only playlists to video+audio', func
               'excluded incompatible playlist');
               'excluded incompatible playlist');
 });
 });
 
 
-QUnit.test('After an initial media playlist 404s, ' +
-'we fire loadedmetadata once we successfully load a playlist',
-function() {
+QUnit.test('After an initial media playlist 404s, we fire loadedmetadata once we successfully load a playlist', function() {
   let count = 0;
   let count = 0;
 
 
   this.player.src({
   this.player.src({
@@ -1480,15 +1478,14 @@ QUnit.test('does not blacklist compatible AAC codec strings', function() {
   standardXHRResponse(this.requests.shift());
   standardXHRResponse(this.requests.shift());
   master = this.player.tech_.hls.playlists.master;
   master = this.player.tech_.hls.playlists.master;
   QUnit.strictEqual(typeof master.playlists[0].excludeUntil,
   QUnit.strictEqual(typeof master.playlists[0].excludeUntil,
-                      'undefined',
+                    'undefined',
                     'did not blacklist');
                     'did not blacklist');
   QUnit.strictEqual(typeof master.playlists[1].excludeUntil,
   QUnit.strictEqual(typeof master.playlists[1].excludeUntil,
                     'undefined',
                     'undefined',
                     'did not blacklist');
                     'did not blacklist');
 });
 });
 
 
-QUnit.test('blacklists switching between playlists with incompatible audio codecs',
-function() {
+QUnit.test('blacklists switching between playlists with incompatible audio codecs', function() {
   let alternatePlaylist;
   let alternatePlaylist;
 
 
   this.player.src({
   this.player.src({
@@ -1548,7 +1545,7 @@ QUnit.test('downloads the next segment if the buffer is getting low', function()
   standardXHRResponse(this.requests[0]);
   standardXHRResponse(this.requests[0]);
   standardXHRResponse(this.requests[1]);
   standardXHRResponse(this.requests[1]);
 
 
-  QUnit.strictEqual(this.requests.length, 2, 'made two this.requests');
+  QUnit.strictEqual(this.requests.length, 2, 'made two requests');
   this.player.tech_.currentTime = function() {
   this.player.tech_.currentTime = function() {
     return 15;
     return 15;
   };
   };
@@ -1588,7 +1585,7 @@ QUnit.test('buffers based on the correct TimeRange if multiple ranges exist', fu
   standardXHRResponse(this.requests[0]);
   standardXHRResponse(this.requests[0]);
   standardXHRResponse(this.requests[1]);
   standardXHRResponse(this.requests[1]);
 
 
-  QUnit.strictEqual(this.requests.length, 2, 'made two this.requests');
+  QUnit.strictEqual(this.requests.length, 2, 'made two requests');
   QUnit.strictEqual(this.requests[1].url,
   QUnit.strictEqual(this.requests[1].url,
                     absoluteUrl('manifest/media-00002.ts'),
                     absoluteUrl('manifest/media-00002.ts'),
                     'made segment request');
                     'made segment request');
@@ -1596,7 +1593,7 @@ QUnit.test('buffers based on the correct TimeRange if multiple ranges exist', fu
   currentTime = 22;
   currentTime = 22;
   this.player.tech_.hls.sourceBuffer.trigger('updateend');
   this.player.tech_.hls.sourceBuffer.trigger('updateend');
   this.player.tech_.hls.checkBuffer_();
   this.player.tech_.hls.checkBuffer_();
-  QUnit.strictEqual(this.requests.length, 3, 'made three this.requests');
+  QUnit.strictEqual(this.requests.length, 3, 'made three requests');
   QUnit.strictEqual(this.requests[2].url,
   QUnit.strictEqual(this.requests[2].url,
                     absoluteUrl('manifest/media-00003.ts'),
                     absoluteUrl('manifest/media-00003.ts'),
                     'made segment request');
                     'made segment request');
@@ -1654,8 +1651,7 @@ QUnit.test('only appends one segment at a time', function() {
   QUnit.equal(appends, 1, 'appended once');
   QUnit.equal(appends, 1, 'appended once');
 });
 });
 
 
-QUnit.test('waits to download new segments until the media playlist is stable',
-function() {
+QUnit.test('waits to download new segments until the media playlist is stable', function() {
   this.player.src({
   this.player.src({
     src: 'manifest/master.m3u8',
     src: 'manifest/master.m3u8',
     type: 'application/vnd.apple.mpegurl'
     type: 'application/vnd.apple.mpegurl'
@@ -1770,6 +1766,7 @@ QUnit.test('segmentXhr is properly nulled out when dispose is called', function(
 
 
   Flash.prototype.dispose = oldDispose;
   Flash.prototype.dispose = oldDispose;
 });
 });
+
 QUnit.test('does not modify the media index for in-buffer seeking', function() {
 QUnit.test('does not modify the media index for in-buffer seeking', function() {
   let mediaIndex;
   let mediaIndex;
 
 
@@ -1872,7 +1869,7 @@ QUnit.test('seeking in an empty playlist is a non-erroring noop', function() {
   this.player.tech_.setCurrentTime(183);
   this.player.tech_.setCurrentTime(183);
   this.clock.tick(1);
   this.clock.tick(1);
 
 
-  QUnit.equal(this.requests.length, requestsLength, 'made no additional this.requests');
+  QUnit.equal(this.requests.length, requestsLength, 'made no additional requests');
 });
 });
 
 
 QUnit.test('sets seekable and duration for live playlists', function() {
 QUnit.test('sets seekable and duration for live playlists', function() {
@@ -1900,10 +1897,6 @@ QUnit.test('sets seekable and duration for live playlists', function() {
 });
 });
 
 
 QUnit.test('live playlist starts three target durations before live', function() {
 QUnit.test('live playlist starts three target durations before live', function() {
-  /* eslint-disable no-unused-vars */
-  let mediaPlaylist;
-  /* eslint-enable no-unused-vars */
-
   this.player.src({
   this.player.src({
     src: 'live.m3u8',
     src: 'live.m3u8',
     type: 'application/vnd.apple.mpegurl'
     type: 'application/vnd.apple.mpegurl'
@@ -1933,7 +1926,6 @@ QUnit.test('live playlist starts three target durations before live', function()
   };
   };
   this.player.tech_.trigger('play');
   this.player.tech_.trigger('play');
   this.clock.tick(1);
   this.clock.tick(1);
-  mediaPlaylist = this.player.tech_.hls.playlists.media();
   QUnit.equal(this.player.currentTime(),
   QUnit.equal(this.player.currentTime(),
               this.player.tech_.hls.seekable().end(0),
               this.player.tech_.hls.seekable().end(0),
               'seeked to the seekable end');
               'seeked to the seekable end');
@@ -1961,14 +1953,14 @@ QUnit.test('live playlist starts with correct currentTime value', function() {
   this.player.tech_.trigger('play');
   this.player.tech_.trigger('play');
   this.clock.tick(1);
   this.clock.tick(1);
 
 
+  let media = this.player.tech_.hls.playlists.media();
+
   QUnit.strictEqual(this.player.currentTime(),
   QUnit.strictEqual(this.player.currentTime(),
-                    videojs.Hls.Playlist.seekable(this.player.tech_.hls.playlists.media())
-                      .end(0),
+                    videojs.Hls.Playlist.seekable(media).end(0),
                     'currentTime is updated at playback');
                     'currentTime is updated at playback');
 });
 });
 
 
-QUnit.test('adjusts the seekable start based on the amount of expired live content',
-function() {
+QUnit.test('adjusts the seekable start based on the amount of expired live content', function() {
   this.player.src({
   this.player.src({
     src: 'http://example.com/manifest/liveStart30sBefore.m3u8',
     src: 'http://example.com/manifest/liveStart30sBefore.m3u8',
     type: 'application/vnd.apple.mpegurl'
     type: 'application/vnd.apple.mpegurl'
@@ -1988,9 +1980,7 @@ function() {
               'offset the seekable start');
               'offset the seekable start');
 });
 });
 
 
-QUnit.test('estimates seekable ranges for live streams ' +
-'that have been paused for a long time',
-function() {
+QUnit.test('estimates seekable ranges for live streams that have been paused for a long time', function() {
   this.player.src({
   this.player.src({
     src: 'http://example.com/manifest/liveStart30sBefore.m3u8',
     src: 'http://example.com/manifest/liveStart30sBefore.m3u8',
     type: 'application/vnd.apple.mpegurl'
     type: 'application/vnd.apple.mpegurl'
@@ -2006,7 +1996,7 @@ function() {
 });
 });
 
 
 QUnit.test('resets the time to a seekable position when resuming a live stream ' +
 QUnit.test('resets the time to a seekable position when resuming a live stream ' +
-     'after a long break', function() {
+           'after a long break', function() {
   let seekTarget;
   let seekTarget;
 
 
   this.player.src({
   this.player.src({
@@ -2019,7 +2009,7 @@ QUnit.test('resets the time to a seekable position when resuming a live stream '
                                 '#EXT-X-MEDIA-SEQUENCE:16\n' +
                                 '#EXT-X-MEDIA-SEQUENCE:16\n' +
                                 '#EXTINF:10,\n' +
                                 '#EXTINF:10,\n' +
                                 '16.ts\n');
                                 '16.ts\n');
-  // mock out the this.playerto simulate a live stream that has been
+  // mock out the player to simulate a live stream that has been
   // playing for awhile
   // playing for awhile
   this.player.tech_.hls.seekable = function() {
   this.player.tech_.hls.seekable = function() {
     return videojs.createTimeRange(160, 170);
     return videojs.createTimeRange(160, 170);
@@ -2041,50 +2031,7 @@ QUnit.test('resets the time to a seekable position when resuming a live stream '
   this.player.tech_.trigger('seeked');
   this.player.tech_.trigger('seeked');
 });
 });
 
 
-QUnit.test('reloads out-of-date live playlists when switching variants', function() {
-  let oldManifest = testDataManifests['variant-update'];
-
-  this.player.src({
-    src: 'http://example.com/master.m3u8',
-    type: 'application/vnd.apple.mpegurl'
-  });
-  openMediaSource(this.player, this.clock);
-
-  this.player.tech_.hls.master = {
-    playlists: [{
-      mediaSequence: 15,
-      segments: [1, 1, 1]
-    }, {
-      uri: 'http://example.com/variant-update.m3u8',
-      mediaSequence: 0,
-      segments: [1, 1]
-    }]
-  };
-  // playing segment 15 on playlist zero
-  this.player.tech_.hls.media = this.player.tech_.hls.master.playlists[0];
-  this.player.mediaIndex = 1;
-
-  testDataManifests['variant-update'] = '#EXTM3U\n' +
-    '#EXT-X-MEDIA-SEQUENCE:16\n' +
-    '#EXTINF:10,\n' +
-    '16.ts\n' +
-    '#EXTINF:10,\n' +
-    '17.ts\n';
-
-  // switch playlists
-  this.player.tech_.hls.selectPlaylist = function() {
-    return this.player.tech_.hls.master.playlists[1];
-  };
-  // timeupdate downloads segment 16 then switches playlists
-  this.player.trigger('timeupdate');
-
-  QUnit.strictEqual(this.player.mediaIndex, 1, 'mediaIndex points at the next segment');
-  testDataManifests['variant-update'] = oldManifest;
-});
-
-QUnit.test('if withCredentials global option is used, ' +
-           'withCredentials is set on the XHR object',
-function() {
+QUnit.test('if withCredentials global option is used, withCredentials is set on the XHR object', function() {
   let hlsOptions = videojs.options.hls;
   let hlsOptions = videojs.options.hls;
 
 
   this.player.dispose();
   this.player.dispose();
@@ -2102,9 +2049,7 @@ function() {
   videojs.options.hls = hlsOptions;
   videojs.options.hls = hlsOptions;
 });
 });
 
 
-QUnit.test('if withCredentials src option is used, ' +
-           'withCredentials is set on the XHR object',
-function() {
+QUnit.test('if withCredentials src option is used, withCredentials is set on the XHR object', function() {
   this.player.dispose();
   this.player.dispose();
   this.player = createPlayer();
   this.player = createPlayer();
   this.player.src({
   this.player.src({
@@ -2131,27 +2076,6 @@ QUnit.test('src level credentials supersede the global options', function() {
 
 
 });
 });
 
 
-QUnit.test('does not break if the playlist has no segments', function() {
-  this.player.src({
-    src: 'manifest/master.m3u8',
-    type: 'application/vnd.apple.mpegurl'
-  });
-  try {
-    openMediaSource(this.player, this.clock);
-    this.requests[0].respond(200, null,
-                             '#EXTM3U\n' +
-                             '#EXT-X-PLAYLIST-TYPE:VOD\n' +
-                             '#EXT-X-TARGETDURATION:10\n');
-  } catch (e) {
-    QUnit.ok(false, 'an error was thrown');
-    throw e;
-  }
-  QUnit.ok(true, 'no error was thrown');
-  QUnit.strictEqual(this.requests.length,
-                    1,
-                    'no this.requestsfor non-existent segments were queued');
-});
-
 QUnit.test('aborts segment processing on seek', function() {
 QUnit.test('aborts segment processing on seek', function() {
   let currentTime = 0;
   let currentTime = 0;
 
 
@@ -2382,10 +2306,12 @@ QUnit.skip('seeking does not fail when targeted between segments', function() {
 
 
   // seek to a time that is greater than the last tag in segment 0 but
   // seek to a time that is greater than the last tag in segment 0 but
   // less than the first in segment 1
   // less than the first in segment 1
+
   /* eslint-disable no-warning-comments */
   /* eslint-disable no-warning-comments */
   // FIXME: it's not possible to seek here without timestamp-based
   // FIXME: it's not possible to seek here without timestamp-based
-  /* eslint-enable no-warning-comments */
   // segment durations
   // segment durations
+  /* eslint-enable no-warning-comments */
+
   this.player.tech_.setCurrentTime(9.4);
   this.player.tech_.setCurrentTime(9.4);
   this.clock.tick(1);
   this.clock.tick(1);
   QUnit.equal(this.requests[0].url, segmentUrl, 'requested the later segment');
   QUnit.equal(this.requests[0].url, segmentUrl, 'requested the later segment');
@@ -2506,8 +2432,7 @@ QUnit.test('the source handler supports HLS mime types', function() {
     QUnit.ok(videojs.HlsSourceHandler(techName).canHandleSource({
     QUnit.ok(videojs.HlsSourceHandler(techName).canHandleSource({
       type: 'aPplicatiOn/VnD.aPPle.MpEgUrL'
       type: 'aPplicatiOn/VnD.aPPle.MpEgUrL'
     }), 'supports vnd.apple.mpegurl');
     }), 'supports vnd.apple.mpegurl');
-    QUnit.ok(videojs.HlsSourceHandler(techName)
-             .canPlayType('aPplicatiOn/VnD.aPPle.MpEgUrL'),
+    QUnit.ok(videojs.HlsSourceHandler(techName).canPlayType('aPplicatiOn/VnD.aPPle.MpEgUrL'),
             'supports vnd.apple.mpegurl');
             'supports vnd.apple.mpegurl');
     QUnit.ok(videojs.HlsSourceHandler(techName).canPlayType('aPplicatiOn/x-MPegUrl'),
     QUnit.ok(videojs.HlsSourceHandler(techName).canPlayType('aPplicatiOn/x-MPegUrl'),
              'supports x-mpegurl');
              'supports x-mpegurl');
@@ -2560,9 +2485,7 @@ QUnit.test('fires loadstart manually if Flash is used', function() {
 QUnit.test('has no effect if native HLS is available', function() {
 QUnit.test('has no effect if native HLS is available', function() {
   let player;
   let player;
 
 
-  videojs.Hls.supportsNativeHls = function() {
-    return true;
-  };
+  videojs.Hls.supportsNativeHls = true;
   player = createPlayer();
   player = createPlayer();
   player.src({
   player.src({
     src: 'http://example.com/manifest/master.m3u8',
     src: 'http://example.com/manifest/master.m3u8',
@@ -2840,8 +2763,7 @@ QUnit.test('a new key XHR is created when a the segment is requested', function(
                     'a key XHR is created with the correct uri');
                     'a key XHR is created with the correct uri');
 });
 });
 
 
-QUnit.test('seeking should abort an outstanding key request and create a new one',
-function() {
+QUnit.test('seeking should abort an outstanding key request and create a new one', function() {
   this.player.src({
   this.player.src({
     src: 'https://example.com/encrypted.m3u8',
     src: 'https://example.com/encrypted.m3u8',
     type: 'application/vnd.apple.mpegurl'
     type: 'application/vnd.apple.mpegurl'
@@ -2874,7 +2796,7 @@ function() {
               'urls should match');
               'urls should match');
 });
 });
 
 
-QUnit.test('retries key this.requestsonce upon failure', function() {
+QUnit.test('retries key requests once upon failure', function() {
   this.player.src({
   this.player.src({
     src: 'https://example.com/encrypted.m3u8',
     src: 'https://example.com/encrypted.m3u8',
     type: 'application/vnd.apple.mpegurl'
     type: 'application/vnd.apple.mpegurl'
@@ -2901,7 +2823,7 @@ QUnit.test('retries key this.requestsonce upon failure', function() {
   QUnit.equal(this.requests.length, 2, 'gives up after one retry');
   QUnit.equal(this.requests.length, 2, 'gives up after one retry');
 });
 });
 
 
-QUnit.test('blacklists playlist if key this.requestsfail more than once', function() {
+QUnit.test('blacklists playlist if key requests fail more than once', function() {
   let bytes = [];
   let bytes = [];
   let media;
   let media;
 
 
@@ -2975,9 +2897,8 @@ QUnit.test('the key is supplied to the decrypter in the correct format', functio
                   'passed the specified segment key');
                   'passed the specified segment key');
 
 
 });
 });
-QUnit.test('supplies the media sequence of current segment' +
-' as the IV by default, if no IV is specified',
-function() {
+
+QUnit.test('supplies the media sequence of current segment as the IV by default, if no IV is specified', function() {
   let ivs = [];
   let ivs = [];
 
 
   this.player.src({
   this.player.src({
@@ -3012,8 +2933,7 @@ function() {
                   'the IV for the segment is the media sequence');
                   'the IV for the segment is the media sequence');
 });
 });
 
 
-QUnit.test('switching playlists with an outstanding key request does not stall playback',
-function() {
+QUnit.test('switching playlists with an outstanding key request does not stall playback', function() {
   let buffered = [];
   let buffered = [];
   let media = '#EXTM3U\n' +
   let media = '#EXTM3U\n' +
     '#EXT-X-MEDIA-SEQUENCE:5\n' +
     '#EXT-X-MEDIA-SEQUENCE:5\n' +
@@ -3084,8 +3004,7 @@ QUnit.test('resolves relative key URLs against the playlist', function() {
               'resolves the key URL');
               'resolves the key URL');
 });
 });
 
 
-QUnit.test('treats invalid keys as a key request failure and blacklists playlist',
-function() {
+QUnit.test('treats invalid keys as a key request failure and blacklists playlist', function() {
   let bytes = [];
   let bytes = [];
   let media;
   let media;
 
 
@@ -3142,7 +3061,7 @@ QUnit.test('live stream should not call endOfStream', function() {
                            '#EXT-X-MEDIA-SEQUENCE:0\n' +
                            '#EXT-X-MEDIA-SEQUENCE:0\n' +
                            '#EXTINF:1\n' +
                            '#EXTINF:1\n' +
                            '0.ts\n');
                            '0.ts\n');
-  this.requests[1].response = bcSegment;
+  this.requests[1].response = new Uint8Array(1);
   this.requests[1].respond(200, null, '');
   this.requests[1].respond(200, null, '');
   QUnit.equal('open',
   QUnit.equal('open',
               this.player.tech_.hls.mediaSource.readyState,
               this.player.tech_.hls.mediaSource.readyState,
@@ -3176,53 +3095,53 @@ QUnit.test('detects time range end-point changed by updates', function() {
 
 
   // Single-range changes
   // Single-range changes
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 10]]),
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 10]]),
-    videojs.createTimeRange([[0, 11]]));
+                                                    videojs.createTimeRange([[0, 11]]));
   QUnit.strictEqual(edge, 11, 'detected a forward addition');
   QUnit.strictEqual(edge, 11, 'detected a forward addition');
 
 
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[5, 10]]),
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[5, 10]]),
-    videojs.createTimeRange([[0, 10]]));
+                                                    videojs.createTimeRange([[0, 10]]));
   QUnit.strictEqual(edge, null, 'ignores backward addition');
   QUnit.strictEqual(edge, null, 'ignores backward addition');
 
 
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[5, 10]]),
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[5, 10]]),
-    videojs.createTimeRange([[0, 11]]));
+                                                    videojs.createTimeRange([[0, 11]]));
   QUnit.strictEqual(edge,
   QUnit.strictEqual(edge,
                     11,
                     11,
                     'detected a forward addition & ignores a backward addition');
                     'detected a forward addition & ignores a backward addition');
 
 
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 10]]),
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 10]]),
-    videojs.createTimeRange([[0, 9]]));
+                                                    videojs.createTimeRange([[0, 9]]));
   QUnit.strictEqual(edge,
   QUnit.strictEqual(edge,
                     null,
                     null,
                     'ignores a backwards addition resulting from a shrinking range');
                     'ignores a backwards addition resulting from a shrinking range');
 
 
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 10]]),
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 10]]),
-    videojs.createTimeRange([[2, 7]]));
+                                                    videojs.createTimeRange([[2, 7]]));
   QUnit.strictEqual(edge,
   QUnit.strictEqual(edge,
                     null,
                     null,
                     'ignores a forward & backwards addition ' +
                     'ignores a forward & backwards addition ' +
                     'resulting from a shrinking range');
                     'resulting from a shrinking range');
 
 
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[2, 10]]),
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[2, 10]]),
-    videojs.createTimeRange([[0, 7]]));
+                                                    videojs.createTimeRange([[0, 7]]));
   QUnit.strictEqual(edge,
   QUnit.strictEqual(edge,
                     null,
                     null,
                     'ignores a forward & backwards addition resulting ' +
                     'ignores a forward & backwards addition resulting ' +
                     'from a range shifted backward');
                     'from a range shifted backward');
 
 
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[2, 10]]),
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[2, 10]]),
-    videojs.createTimeRange([[5, 15]]));
+                                                    videojs.createTimeRange([[5, 15]]));
   QUnit.strictEqual(edge,
   QUnit.strictEqual(edge,
                     15,
                     15,
                     'detected a forwards addition resulting from a range shifted foward');
                     'detected a forwards addition resulting from a range shifted foward');
 
 
   // Multiple-range changes
   // Multiple-range changes
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 10]]),
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 10]]),
-    videojs.createTimeRange([[0, 11], [12, 15]]));
+                                                    videojs.createTimeRange([[0, 11], [12, 15]]));
   QUnit.strictEqual(edge, null, 'ignores multiple new forward additions');
   QUnit.strictEqual(edge, null, 'ignores multiple new forward additions');
 
 
   edge = videojs.Hls
   edge = videojs.Hls
     .findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 10], [20, 40]]),
     .findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 10], [20, 40]]),
-    videojs.createTimeRange([[20, 50]]));
+                                    videojs.createTimeRange([[20, 50]]));
   QUnit.strictEqual(edge, 50, 'detected a forward addition & ignores range removal');
   QUnit.strictEqual(edge, 50, 'detected a forward addition & ignores range removal');
 
 
   edge =
   edge =
@@ -3239,20 +3158,19 @@ QUnit.test('detects time range end-point changed by updates', function() {
 
 
   // Empty input
   // Empty input
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange(),
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange(),
-    videojs.createTimeRange([[0, 11]]));
+                                                    videojs.createTimeRange([[0, 11]]));
   QUnit.strictEqual(edge, 11, 'handle an empty original TimeRanges object');
   QUnit.strictEqual(edge, 11, 'handle an empty original TimeRanges object');
 
 
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 11]]),
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 11]]),
-    videojs.createTimeRange());
+                                                    videojs.createTimeRange());
   QUnit.strictEqual(edge, null, 'handle an empty update TimeRanges object');
   QUnit.strictEqual(edge, null, 'handle an empty update TimeRanges object');
 
 
   // Null input
   // Null input
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(null,
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(null,
-    videojs.createTimeRange([[0, 11]]));
+                                                    videojs.createTimeRange([[0, 11]]));
   QUnit.strictEqual(edge, 11, 'treat null original buffer as an empty TimeRanges object');
   QUnit.strictEqual(edge, 11, 'treat null original buffer as an empty TimeRanges object');
 
 
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 11]]),
   edge = videojs.Hls.findSoleUncommonTimeRangesEnd_(videojs.createTimeRange([[0, 11]]),
-    null);
+                                                    null);
   QUnit.strictEqual(edge, null, 'treat null update buffer as an empty TimeRanges object');
   QUnit.strictEqual(edge, null, 'treat null update buffer as an empty TimeRanges object');
 });
 });
-