Simplified unit tests and added warning being thrown by lint to its i…

…gnore list
mozilla · Sep 14, 2011 · 3e7e6d0 · 3e7e6d0
1 parent e01aea8
commit 3e7e6d0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/build/jslint-check.js b/build/jslint-check.js
@@ -10,7 +10,8 @@ var ok = {
   "Expected an assignment or function call and instead saw an expression.": true,
   "Expected a 'break' statement before 'case'.": true,
   "'e' is already defined.": true,
-  "Don't make functions within a loop.": true
+  "Don't make functions within a loop.": true,
+  "['out'] is better written in dot notation.": true
 };
 
 function check(src)

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
@@ -2582,35 +2582,27 @@ test( "In/Out aliases", function() {
   var popcorn = Popcorn( "#video" ),
       expects = 3,
       count = 0,
-      aliasDiv = document.createElement( "div" );
+      counter = 0; 
-
-  document.body.appendChild( aliasDiv );
 
   expect( expects );
   stop( 5000 );
 
   function plus() {
     if ( ++count === expects ) {
       Popcorn.removePlugin( "aliasTester" );
-      document.body.removeChild( aliasDiv );
+      Popcorn.removeInstance( popcorn );
       start();
     }
   }
 
-  aliasDiv.id = "aliasDiv";
-
   Popcorn.plugin( "aliasTester", function() {
 
     return {
       start: function() {
-        var div = document.getElementById( "aliasDiv" );
+        counter++;
-        div.style.display = "inline";
-        div.innerHTML = "Showing";       
       },
       end: function() {
-        var div = document.getElementById( "aliasDiv" );
+        counter++;
-        div.innerHTML = "";
-        div.style.display = "none";   
       }
     };
   });
@@ -2622,16 +2614,16 @@ test( "In/Out aliases", function() {
 
   popcorn.currentTime( 0 ).pause();
 
-  equals( aliasDiv.innerHTML, "", "Container is initially empty" );
+  equals( counter, 0, "Container is initially empty" );
   plus();
 
   popcorn.exec( 2, function() {
-    equals( aliasDiv.innerHTML, "Showing", "Container is displaying 'Showing', in alias is working" );
+    equals( counter, 1, "Container is displaying 'Showing', in alias is working" );
     plus();
   });
 
   popcorn.exec( 4, function() {
-    equals( aliasDiv.innerHTML, "", "Container is displaying nothing again, out alias is working" );
+    equals( counter, 2, "Container is displaying nothing again, out alias is working" );
     plus();
   });