From e0b1008225b56a51572cc7cac2d43887503400ca Mon Sep 17 00:00:00 2001
From: heff <git@heff.me>
Date: Thu, 23 Jul 2015 12:45:41 -0700
Subject: [PATCH] Fix IE8 tests

- Removed incompatible module
- Added ie8 shim to qunit index.html
- Fixed extends() usage

--skip-ci
---
 test/index.html             |  2 ++
 test/unit/player.test.js    | 53 ++++++++++++++-----------------------
 test/unit/tech/tech.test.js |  4 +--
 3 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/test/index.html b/test/index.html
index a1edc36ac..f9659ab51 100644
--- a/test/index.html
+++ b/test/index.html
@@ -10,6 +10,8 @@
   <div id="qunit"></div>
   <script src="../node_modules/qunitjs/qunit/qunit.js"></script>
 
+  <script src="../build/temp/ie8/videojs-ie8.min.js"></script>
+
   <!-- Execute the bundled tests first -->
   <script src="../build/temp/tests.js"></script>
 
diff --git a/test/unit/player.test.js b/test/unit/player.test.js
index 0c0262118..78e49ec60 100644
--- a/test/unit/player.test.js
+++ b/test/unit/player.test.js
@@ -8,7 +8,6 @@ import MediaError from '../../src/js/media-error.js';
 import Html5 from '../../src/js/tech/html5.js';
 import TestHelpers from './test-helpers.js';
 import document from 'global/document';
-import css from 'css';
 
 q.module('Player', {
   'setup': function() {
@@ -161,57 +160,45 @@ test('should set the width, height, and aspect ratio via a css class', function(
     return (styleEl.styleSheet && styleEl.styleSheet.cssText) || styleEl.innerHTML;
   };
 
+  // NOTE: was using npm/css to parse the actual CSS ast
+  // but the css module doesn't support ie8
+  let confirmSetting = function(prop, val) {
+    let styleText = getStyleText(player.styleEl_);
+    let re = new RegExp(prop+':\\s?'+val);
+
+    // Lowercase string for IE8
+    styleText = styleText.toLowerCase();
+
+    return !!re.test(styleText);
+  };
+
+  // Initial state
   ok(player.styleEl_.parentNode === player.el(), 'player has a style element');
   ok(!getStyleText(player.styleEl_), 'style element should be empty when the player is given no dimensions');
 
-  let rules;
-
-  function getStyleRules(){
-    const styleText = getStyleText(player.styleEl_);
-    const cssAST = css.parse(styleText);
-    const styleRules = {};
-
-    cssAST.stylesheet.rules.forEach(function(ruleAST){
-      let selector = ruleAST.selectors.join(' ');
-      styleRules[selector] = {};
-      let rule = styleRules[selector];
-
-      ruleAST.declarations.forEach(function(dec){
-        rule[dec.property] = dec.value;
-      });
-    });
-
-    return styleRules;
-  }
-
   // Set only the width
   player.width(100);
-  rules = getStyleRules();
-  equal(rules['.example_1-dimensions'].width, '100px', 'style width should equal the supplied width in pixels');
-  equal(rules['.example_1-dimensions'].height, '56.25px', 'style height should match the default aspect ratio of the width');
+  ok(confirmSetting('width', '100px'), 'style width should equal the supplied width in pixels');
+  ok(confirmSetting('height', '56.25px'), 'style height should match the default aspect ratio of the width');
 
   // Set the height
   player.height(200);
-  rules = getStyleRules();
-  equal(rules['.example_1-dimensions'].height, '200px', 'style height should match the supplied height in pixels');
+  ok(confirmSetting('height', '200px'), 'style height should match the supplied height in pixels');
 
   // Reset the width and height to defaults
   player.width('');
   player.height('');
-  rules = getStyleRules();
-  equal(rules['.example_1-dimensions'].width, '300px', 'supplying an empty string should reset the width');
-  equal(rules['.example_1-dimensions'].height, '168.75px', 'supplying an empty string should reset the height');
+  ok(confirmSetting('width', '300px'), 'supplying an empty string should reset the width');
+  ok(confirmSetting('height', '168.75px'), 'supplying an empty string should reset the height');
 
   // Switch to fluid mode
   player.fluid(true);
-  rules = getStyleRules();
   ok(player.hasClass('vjs-fluid'), 'the vjs-fluid class should be added to the player');
-  equal(rules['.example_1-dimensions.vjs-fluid']['padding-top'], '56.25%', 'fluid aspect ratio should match the default aspect ratio');
+  ok(confirmSetting('padding-top', '56.25%'), 'fluid aspect ratio should match the default aspect ratio');
 
   // Change the aspect ratio
   player.aspectRatio('4:1');
-  rules = getStyleRules();
-  equal(rules['.example_1-dimensions.vjs-fluid']['padding-top'], '25%', 'aspect ratio percent should match the newly set aspect ratio');
+  ok(confirmSetting('padding-top', '25%'), 'aspect ratio percent should match the newly set aspect ratio');
 });
 
 test('should wrap the original tag in the player div', function(){
diff --git a/test/unit/tech/tech.test.js b/test/unit/tech/tech.test.js
index 32bca836a..db17e0463 100644
--- a/test/unit/tech/tech.test.js
+++ b/test/unit/tech/tech.test.js
@@ -1,8 +1,8 @@
 var noop = function() {}, clock, oldTextTracks;
 
-import extendsFn from '../../../src/js/extends.js';
 import Tech from '../../../src/js/tech/tech.js';
 import { createTimeRange } from '../../../src/js/utils/time-ranges.js';
+import extendsFn from '../../../src/js/extends.js';
 
 q.module('Media Tech', {
   'setup': function() {
@@ -204,7 +204,7 @@ test('should track whether a video has played', function() {
 });
 
 test('delegates seekable to the source handler', function(){
-  let MyTech = Tech.extend({
+  let MyTech = extendsFn(Tech, {
     seekable: function() {
       throw new Error('You should not be calling me!');
     }