Concatenate the files

lib/mock-ajax.js

@@ -83,6 +83,16 @@ getJasmineRequireObj().AjaxFakeRequest = function() {
     };
   }
 
+  function unconvertibleResponseTypeMessage(type) {
+    var msg = [
+      "Can't build XHR.response for XHR.responseType of '",
+      type,
+      "'.",
+      "XHR.response must be explicitly stubbed"
+    ];
+    return msg.join(' ');
+  }
+
   function fakeRequest(global, requestTracker, stubTracker, paramParser) {
     function FakeXMLHttpRequest() {
       requestTracker.track(this);
@@ -251,14 +261,27 @@ getJasmineRequireObj().AjaxFakeRequest = function() {
       },
 
       responseText: null,
-
-      response: function(response) {
-        if (window.console && window.console.warn) {
-          window.console.warn("jasmine-ajax's response method is deprecated because it conflicts with XmlHTTPRequest 2 sytax. It will be removed in a later version. Please use respondWith");
+      response: null,
+      responseType: null,
+
+      responseValue: function() {
+        switch(this.responseType) {
+          case null:
+          case "":
+          case "text":
+            return this.readyState >= 3 ? this.responseText : "";
+          case "json":
+            return JSON.parse(this.responseText);
+          case "arraybuffer":
+            throw unconvertibleResponseTypeMessage('arraybuffer');
+          case "blob":
+            throw unconvertibleResponseTypeMessage('blob');
+          case "document":
+            return this.responseXML;
         }
-        this.respondWith(response);
       },
 
+
       respondWith: function(response) {
         if (this.readyState === 4) {
           throw new Error("FakeXMLHttpRequest already completed");
@@ -266,9 +289,19 @@ getJasmineRequireObj().AjaxFakeRequest = function() {
         this.status = response.status;
         this.statusText = response.statusText || "";
         this.responseText = response.responseText || "";
+        this.responseType = response.responseType || "";
         this.readyState = 4;
         this.responseHeaders = normalizeHeaders(response.responseHeaders, response.contentType);
         this.responseXML = getResponseXml(response.responseText, this.getResponseHeader('content-type') || '');
+        if (this.responseXML) {
+          this.responseType = 'document';
+        }
+
+        if ('response' in response) {
+          this.response = response.response;
+        } else {
+          this.response = this.responseValue();
+        }
 
         this.onreadystatechange();
         this.events.progress();
@@ -431,6 +464,7 @@ getJasmineRequireObj().AjaxRequestStub = function() {
       this.status = options.status || 200;
 
       this.contentType = options.contentType;
+      this.response = options.response;
       this.responseText = options.responseText;
     };