Better emulate jQuery by resolving successful request on JSON parse error

lib/najax.js

@@ -138,7 +138,11 @@ function najax (uri, options, callback) {
         try {
           data = JSON.parse(data.replace(/[\cA-\cZ]/gi, ''))
         } catch (e) {
-          return onError(e)
+          //emulate jQuery functionality (replace data with JSON parse error)
+          data = {
+            state: 'parsererror',
+            error: 'Failed to parse JSON string: ' + e.message
+          }
         }
       }
 

test/test-najax.js

@@ -73,6 +73,14 @@ describe('url', function (next) {
   }
 
   it('should accept plain URL', function (done) {
+    // An extra nock seems to be being
+    // registered and affecting the subsequent tests
+    // (I beleive it is caused by:
+    // https://github.com/najaxjs/najax/commit/54cfac6aa0b7cf8a89efae0f39d1f054c8859de0
+    // commenting out the 'default to "GET"' test also fixes this)
+    // make an extra call to najax in order to clear it
+    najax({url: 'http://www.example.com'})
+
     mockPlain('get')
     najax('http://www.example.com', createSuccess(done))
   })
@@ -82,6 +90,19 @@ describe('url', function (next) {
     najax({ url: 'http://www.example.com' }, createSuccess(done))
   })
 
+  it('should not fail when result is broken JSON', function (done) {
+    mockPlain('get')
+    najax({url: 'http://www.example.com', dataType: 'json'}, jsonError(done))
+  })
+
+  it('should succeed when result is good JSON', function (done) {
+    nock('http://www.example.com')
+      .get('/')
+      .reply(200, {'test': 'ok'})
+
+    najax({url: 'http://www.example.com', dataType: 'json'}, jsonSuccess(done))
+  })
+
   it('should parse auth from the url', function (done) {
     mockAuth('get')
     najax({ url: 'http://' + authString + '@www.example.com' }, createSuccess(done))
@@ -343,6 +364,22 @@ function createSuccess (done) {
   }
 }
 
+function jsonSuccess (done) {
+  return function (data, statusText) {
+    expect(data.test).to.equal('ok')
+    expect(statusText).to.equal('success')
+    done()
+  }
+}
+
+function jsonError (done) {
+  return function (data, statusText) {
+    expect(data.state).to.equal('parsererror')
+    expect(statusText).to.equal('success')
+    done()
+  }
+}
+
 function error (e) {
   throw e
 }