Only install Prototype.js glue code if Prototype.js is included; Spec…

… Helper will now install either or both mocking code
rdy · Sep 17, 2010 · ec1867e · ec1867e
1 parent ace08b2
commit ec1867e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/lib/mock-ajax.js b/lib/mock-ajax.js
@@ -3,10 +3,10 @@ var ajaxRequests = [];
 
 function mostRecentAjaxRequest() {
   if (ajaxRequests.length > 0) {
-     return ajaxRequests[ajaxRequests.length - 1];
-   } else {
-     return null;
-   }
+    return ajaxRequests[ajaxRequests.length - 1];
+  } else {
+    return null;
+  }
 }
 
 function clearAjaxRequests() {
@@ -49,7 +49,7 @@ function FakeXMLHttpRequest() {
       xhr.responseText = response.responseText || "";
       xhr.readyState = 4;
       xhr.responseHeaders = response.responseHeaders ||
-                            {"Content-type": response.contentType || "application/json" };
+      {"Content-type": response.contentType || "application/json" };
 
       // uncomment for jquery 1.3.x support
       // jasmine.Clock.tick(20);
@@ -62,13 +62,14 @@ function FakeXMLHttpRequest() {
 }
 
 // Jasmine-Ajax Glue code for Prototype.js
-Ajax.Request.prototype.originalRequest = Ajax.Request.prototype.request;
-Ajax.Request.prototype.request = function(url) {
-  this.originalRequest(url);
-   ajaxRequests.push(this);
-};
-
-Ajax.Request.prototype.response = function(responseOptions) {
-  return this.transport.response(responseOptions);
-};
+if (typeof Prototype != 'undefined' && Ajax && Ajax.Request) {
+  Ajax.Request.prototype.originalRequest = Ajax.Request.prototype.request;
+  Ajax.Request.prototype.request = function(url) {
+    this.originalRequest(url);
+    ajaxRequests.push(this);
+  };
 
+  Ajax.Request.prototype.response = function(responseOptions) {
+    return this.transport.response(responseOptions);
+  };
+}
diff --git a/lib/spec-helper.js b/lib/spec-helper.js
@@ -6,11 +6,14 @@ beforeEach(function() {
       ajaxRequests.push(newXhr);
       return newXhr;
     });
-  } else {
+  }
+
+  if (typeof Prototype != 'undefined') {
     spyOn(Ajax, "getTransport").andCallFake(function() {
       return new FakeXMLHttpRequest();
     });
   }
+
   clearAjaxRequests();
 
 });