Fixing tests around changing to JSON bodies

Author: Joe Wiggins

src/Api.ts

@@ -385,7 +385,7 @@ export class Api {
             headers.append('Content-Type', 'application/json')
             bodyParams = JSON.stringify(params)
             if (options.method === Api.Methods.GET) {
-                if (bodyParams) {
+                if (bodyParams && Object.keys(params).length > 0) {
                     queryString = '?' + Object.keys(params).reduce(function(a, k) {
                             a.push(k + '=' + encodeURIComponent(params[k]))
                             return a

test/integration/copy.spec.ts

@@ -50,7 +50,7 @@ describe('Copy', function() {
                 const [url, opts] = fetchMock.lastCall('copy')
                 should(url).endWith('foo')
                 should(opts.method).equal('POST')
-                should(opts.body).containEql('copySourceID=bar')
+                should(opts.body).containEql('{"copySourceID":"bar"}')
             })
         })
         it('returns data with a new ID', function() {

test/integration/create.spec.ts

@@ -56,8 +56,7 @@ describe('Create', function() {
             const [url, opts] = fetchMock.lastCall('create')
             should(url).endWith(objCode)
             should(opts.method).equal('POST')
-            should(opts.body).containEql('foo=bar')
-            should(opts.body).containEql(encodeURIComponent(fields.join(',')))
+            should(opts.body).containEql('{"foo":"bar","fields":"*,zzz:*"}')
         })
     })
     it('should return the new created object', function() {

test/integration/edit.spec.ts

@@ -58,7 +58,7 @@ describe('Edit', function() {
             should(opts.method).equal('PUT')
             should(url).endWith(objCode + '/' + objID)
             should(opts.headers.get('apiKey')).equal('testapikey')
-            should(opts.body).containEql('name=' + encodeURIComponent('api test 2'))
+            should(opts.body).containEql(JSON.stringify(params))
 
             should(data).have.properties(['ID', 'name', 'objCode'])
             should(data.objCode).equal(objCode)

test/integration/editUsingGet.spec.ts

@@ -57,10 +57,10 @@ describe('Edit', function() {
         return this.api.edit(objCode, objID, params).then(function(data) {
             const [url, opts] = fetchMock.lastCall('edit')
             should(opts.method).equal('GET')
-            should(url).endWith(objCode + '/' + objID)
+            should(url).containEql(objCode + '/' + objID)
             should(opts.headers.get('apiKey')).equal('testapikey')
-            should(opts.body).containEql('name=' + encodeURIComponent('api test 2'))
-            should(opts.body).containEql('method=PUT')
+            should(opts.body).equal(null)
+            should(url).containEql('name=' + encodeURIComponent('api test 2') + '&method=PUT')
 
             should(data).have.properties(['ID', 'name', 'objCode'])
             should(data.objCode).equal(objCode)

test/integration/execute.spec.ts

@@ -49,7 +49,7 @@ describe('Execute', function() {
         return this.api.execute('foo', 'bar', 'baz').then(function() {
             const [url, opts] = fetchMock.lastCall('execute')
             should(url).endWith('foo/bar/baz')
-            should(opts.body).equal('')
+            should(opts.body).equal('{}')
             should(opts.method).equal('POST')
         })
     })
@@ -58,7 +58,7 @@ describe('Execute', function() {
         return this.api.execute('foo', 'bar', 'baz', {foo: 'barbaz'}).then(function() {
             const [url, opts] = fetchMock.lastCall('execute')
             should(url).endWith('foo/bar/baz')
-            should(opts.body).containEql('foo=barbaz')
+            should(opts.body).containEql('{"foo":"barbaz"}')
             should(opts.method).equal('POST')
         })
     })
@@ -67,9 +67,9 @@ describe('Execute', function() {
         return this.api.execute('foo', null, 'baz', {foo: 'barbaz'}).then(function() {
             const [url, opts] = fetchMock.lastCall('execute')
             should(url).endWith('foo')
-            should(opts.body).containEql('action=baz')
-            should(opts.body).containEql('foo=barbaz')
-            should(opts.body).containEql('method=PUT')
+            should(opts.body).containEql('"action":"baz"')
+            should(opts.body).containEql('"foo":"barbaz"')
+            should(opts.body).containEql('"method":"PUT"')
             should(opts.method).equal('POST')
         })
     })
@@ -78,9 +78,9 @@ describe('Execute', function() {
         return this.api.execute('foo', null, 'baz').then(function() {
             const [url, opts] = fetchMock.lastCall('execute')
             should(url).endWith('foo')
-            should(opts.body).containEql('action=baz')
+            should(opts.body).containEql('"action":"baz"')
             should(opts.method).equal('POST')
-            should(opts.body).containEql('method=PUT')
+            should(opts.body).containEql('"method":"PUT"')
         })
     })
 })

test/integration/login.spec.ts

@@ -66,8 +66,8 @@ describe('Login', function() {
             this.api.login('foo', 'bar')
             const [url, opts] = fetchMock.lastCall('login')
             should(url).endWith('login')
-            should(opts.body).containEql('username=foo')
-            should(opts.body).containEql('password=bar')
+            should(opts.body).containEql('"username":"foo"')
+            should(opts.body).containEql('"password":"bar"')
         })
     })
     describe('authentication exception', function() {