[#573] Adds protection handling for popcorn proto methods inside of r…

…emovePlugin; 28 Unit tests
rwaldron · Jun 14, 2011 · 6133d56 · 6133d56
1 parent 6e02766
commit 6133d56
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/popcorn.js b/popcorn.js
@@ -642,7 +642,7 @@
 
   //  Protected API methods
   Popcorn.protect = {
-    natives: "load play pause currentTime playbackRate mute volume duration removePlugin roundTime trigger listen unlisten".toLowerCase().split( /\s+/ )
+    natives: "load play pause currentTime playbackRate mute volume duration removePlugin roundTime trigger listen unlisten exec".toLowerCase().split( /\s+/ )
   };
 
   // Internal Only - Adds track events to the instance object
@@ -836,7 +836,7 @@
   Popcorn.plugin = function( name, definition, manifest ) {
 
     if ( Popcorn.protect.natives.indexOf( name.toLowerCase() ) >= 0 ) {
-      Popcorn.error("'" + name + "' is a protected function name");
+      Popcorn.error( "'" + name + "' is a protected function name" );
       return;
     }
 
@@ -956,6 +956,11 @@
       name = obj;
       obj = Popcorn.p;
 
+      if ( Popcorn.protect.natives.indexOf( name.toLowerCase() ) >= 0 ) {
+        Popcorn.error( "'" + name + "' is a protected function name" );
+        return;
+      }
+
       var registryLen = Popcorn.registry.length,
           registryIdx;
 

diff --git a/test/popcorn.unit.js b/test/popcorn.unit.js
@@ -334,6 +334,25 @@ test("Protected", function () {
 
 });
 
+test("Protected from removal", function () {
+
+  expect( Popcorn.protect.natives.length * 2 );
+
+  Popcorn.protect.natives.forEach(function( name ) {
+
+    try {
+      Popcorn.plugin( name );
+    } catch( e ) {
+      ok( true, e.message + " and cannot be used as a plugin name" );
+    }
+
+    try {
+      Popcorn.removePlugin( name );
+    } catch( e ) {
+      ok( true, e.message + " and cannot be removed with this API" );
+    }
+  });
+});