merge

1 files changed, 18 insertions, 12 deletions

diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js
index 5fca3524..8fac7598 100644
--- a/test/testabilityPatch.js
+++ b/test/testabilityPatch.js
@@ -6,13 +6,19 @@ HIDDEN = jQuery.browser.msie ?
          ' style="display: none; "' :
          ' style="display: none;"';
 
-nglr.msie = jQuery.browser.msie;
-nglr.alert = function(msg) {jstestdriver.console.log("ALERT: " + msg);};
+msie = jQuery.browser.msie;
+alert = function(msg) {jstestdriver.console.log("ALERT: " + msg);};
 
 function noop(){}
 
 jstd = jstestdriver;
 
+swfobject = {
+  createSwf:function(){
+    fail("must mock out swfobject.createSwf in test.");
+  }
+};
+
 function html(content) {
   return jQuery("<div></div>").html(content);
 }
@@ -29,13 +35,13 @@ function report(reportTest){
   });
 }
 
-MockUrlWatcher = function() {
+MockLocation = function() {
   this.url = "http://server";
 };
-MockUrlWatcher.prototype.getUrl = function(){
+MockLocation.prototype.get = function(){
   return this.url;
 };
-MockUrlWatcher.prototype.setUrl = function(url){
+MockLocation.prototype.set = function(url){
   this.url = url;
 };
 
@@ -44,7 +50,7 @@ jQuery.fn.sortedHtml = function() {
   var toString = function(index, node) {
     node = node || this;
     if (node.nodeName == "#text") {
-      html += nglr.escapeHtml(node.nodeValue);
+      html += escapeHtml(node.nodeValue);
     } else {
       html += '<' + node.nodeName.toLowerCase();
       var attributes = node.attributes || [];
@@ -83,14 +89,14 @@ jQuery.fn.sortedHtml = function() {
 };
 
 function encode64(obj){
-  return Base64.encode(nglr.toJson(obj));
+  return Base64.encode(toJson(obj));
 }
 
 function decode64(base64){
-  return nglr.fromJson(Base64.decode(base64));
+  return fromJson(Base64.decode(base64));
 }
 
-nglr.Loader.prototype.configureJQueryPlugins();
+configureJQueryPlugins();
 
 function assertHidden(node) {
   var display = node.css('display');
@@ -104,7 +110,7 @@ function assertVisible(node) {
 }
 
 function assertJsonEquals(expected, actual) {
-  assertEquals(nglr.toJson(expected), nglr.toJson(actual));
+  assertEquals(toJson(expected), toJson(actual));
 }
 
 function assertUndefined(value) {
@@ -112,7 +118,7 @@ function assertUndefined(value) {
 }
 
 function assertDefined(value) {
-  assertTrue(nglr.toJson(value), !!value);
+  assertTrue(toJson(value), !!value);
 }
 
 function assertThrows(error, fn){
@@ -126,4 +132,4 @@ function assertThrows(error, fn){
     fail("Expecting exception, none thrown");
   }
   assertEquals(error, exception);
-}
\ No newline at end of file
+}