Fix bug in assertions returning true for some tests

package.json

@@ -1,53 +1,53 @@
 {
-  "name": "chartmogul-node",
-  "version": "3.4.0",
-  "description": "Official Chartmogul API Node.js Client",
-  "main": "lib/chartmogul.js",
-  "scripts": {
-    "test": "mocha",
-    "lint": "eslint --fix .",
-    "cover": "nyc mocha",
-    "prepare": "npm run lint && npm run test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/chartmogul/chartmogul-node.git"
-  },
-  "keywords": [
-    "chartmogul",
-    "api"
-  ],
-  "author": "ChartMogul Ltd. <[email protected]>",
-  "contributors": [
-    "Mahmudul Hassan <[email protected]>"
-  ],
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/chartmogul/chartmogul-node/issues"
-  },
-  "homepage": "https://github.com/chartmogul/chartmogul-node",
-  "engines": {
-    "node": ">=16"
-  },
-  "dependencies": {
-    "retry": "^0.13.1",
-    "superagent": "^8.1.2",
-    "uri-templates": "^0.2.0"
-  },
-  "devDependencies": {
-    "@babel/traverse": ">=7.23.2",
-    "chai": "",
-    "dependency-lint": "^7.1.0",
-    "eslint": "^8.54.0",
-    "eslint-config-standard": "",
-    "eslint-plugin-import": "",
-    "eslint-plugin-n": "",
-    "eslint-plugin-promise": "",
-    "eslint-plugin-standard": "",
-    "mocha": "",
-    "nock": "",
-    "nyc": "^15.1.0",
-    "pre-commit": ""
-  },
-  "pre-commit": "prepare"
+	"name": "chartmogul-node",
+	"version": "3.5.0",
+	"description": "Official Chartmogul API Node.js Client",
+	"main": "lib/chartmogul.js",
+	"scripts": {
+		"test": "mocha",
+		"lint": "eslint --fix .",
+		"cover": "nyc mocha",
+		"prepare": "npm run lint && npm run test"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/chartmogul/chartmogul-node.git"
+	},
+	"keywords": [
+		"chartmogul",
+		"api"
+	],
+	"author": "ChartMogul Ltd. <[email protected]>",
+	"contributors": [
+		"Mahmudul Hassan <[email protected]>"
+	],
+	"license": "MIT",
+	"bugs": {
+		"url": "https://github.com/chartmogul/chartmogul-node/issues"
+	},
+	"homepage": "https://github.com/chartmogul/chartmogul-node",
+	"engines": {
+		"node": ">=16"
+	},
+	"dependencies": {
+		"retry": "^0.13.1",
+		"superagent": "^8.1.2",
+		"uri-templates": "^0.2.0"
+	},
+	"devDependencies": {
+		"@babel/traverse": ">=7.23.2",
+		"chai": "",
+		"dependency-lint": "^7.1.0",
+		"eslint": "^8.54.0",
+		"eslint-config-standard": "",
+		"eslint-plugin-import": "",
+		"eslint-plugin-n": "",
+		"eslint-plugin-promise": "",
+		"eslint-plugin-standard": "",
+		"mocha": "",
+		"nock": "",
+		"nyc": "^15.1.0",
+		"pre-commit": ""
+	},
+	"pre-commit": "prepare"
 }

test/chartmogul/account.js

@@ -7,26 +7,22 @@ const nock = require('nock');
 const Account = ChartMogul.Account;
 
 describe('Account', () => {
-  it('should retrieve the details of current account', () => {
+  it('should retrieve the details of current account', async () => {
     nock(config.API_BASE)
       .get('/v1/account')
       .reply(200, {
-      /* eslint-disable camelcase */
+        /* eslint-disable camelcase */
         name: 'Example Test Company',
         currency: 'EUR',
         time_zone: 'Europe/Berlin',
         week_start_on: 'sunday'
-      /* eslint-enable camelcase */
+        /* eslint-enable camelcase */
       });
 
-    return Account.retrieve(config, (err, res) => {
-      if (err) {
-        return err;
-      }
-      expect(res.name).to.be.equal('Example Test Company');
-      expect(res.currency).to.be.equal('EUR');
-      expect(res.time_zone).to.be.equal('Europe/Berlin');
-      expect(res.week_start_on).to.be.equal('sunday');
-    });
+    const account = await Account.retrieve(config);
+    expect(account.name).to.be.equal('Example Test Company');
+    expect(account.currency).to.be.equal('EUR');
+    expect(account.time_zone).to.be.equal('Europe/Berlin');
+    expect(account.week_start_on).to.be.equal('sunday');
   });
 });

test/chartmogul/contact.js

@@ -7,7 +7,7 @@ const nock = require('nock');
 const Contact = ChartMogul.Contact;
 
 describe('Contact', () => {
-  it('creates a new contact', () => {
+  it('creates a new contact', async () => {
     const postBody = {
       /* eslint-disable camelcase */
       customer_uuid: 'cus_919d5d7c-9e23-11ed-a936-97fbf69ba02b',
@@ -53,13 +53,11 @@ describe('Contact', () => {
         /* eslint-enable camelcase */
       });
 
-    Contact.create(config, postBody)
-      .then(res => {
-        expect(res).to.have.property('uuid');
-      });
+    const contact = await Contact.create(config, postBody);
+    expect(contact).to.have.property('uuid');
   });
 
-  it('should list all contacts with pagination', done => {
+  it('should list all contacts with pagination', async () => {
     const query = {
       per_page: 1,
       cursor: 'cursor=='
@@ -82,36 +80,34 @@ describe('Contact', () => {
       /* eslint-enable camelcase */
       });
 
-    Contact.all(config, query)
-      .then(res => {
-        expect(res).to.have.property('entries');
-        expect(res.entries).to.be.instanceof(Array);
-        expect(res.cursor).to.eql('MjAyMy0wMy0xM1QxMjowMTozMi44MD==');
-        expect(res.has_more).to.eql(false);
-      });
-    done();
+    const contact = await Contact.all(config, query);
+    expect(contact).to.have.property('entries');
+    expect(contact).to.have.property('cursor');
+    expect(contact).to.have.property('has_more');
+    expect(contact.entries).to.be.instanceof(Array);
+    expect(contact.cursor).to.eql('MjAyMy0wMy0xM1QxMjowMTozMi44MD==');
+    expect(contact.has_more).to.eql(false);
   });
 
-  it('throws DeprecatedParamError if using old pagination parameter', done => {
-    const query = {
-      page: 1
-    };
+  it('throws DeprecatedParamError if using old pagination parameter', async () => {
+    const query = { page: 1 };
 
     nock(config.API_BASE)
       .get('/v1/contacts')
       .query(query)
       .reply(200, {});
-    Contact.all(config, query)
-      .then(res => done(new Error('Should throw error')))
+
+    await Contact.all(config, query)
       .catch(e => {
         expect(e).to.be.instanceOf(ChartMogul.DeprecatedParamError);
-        expect(e.httpStatus).to.equal(422);
         expect(e.message).to.equal('"page" param is deprecated {}');
+        expect(e.httpStatus).to.equal(422);
+        // eslint-disable-next-line no-unused-expressions
+        expect(e.response).to.empty;
       });
-    done();
   });
 
-  it('retrieves a contact', () => {
+  it('retrieves a contact', async () => {
     const contactUuid = 'con_00000000-0000-0000-0000-000000000000';
 
     nock(config.API_BASE)
@@ -138,13 +134,11 @@ describe('Contact', () => {
         /* eslint-enable camelcase */
       });
 
-    return Contact.retrieve(config, contactUuid)
-      .then(res => {
-        expect(res).to.have.property('uuid');
-      });
+    const contact = await Contact.retrieve(config, contactUuid);
+    expect(contact).to.have.property('uuid');
   });
 
-  it('updates a contact', () => {
+  it('updates a contact', async () => {
     const contactUuid = 'con_00000000-0000-0000-0000-000000000000';
 
     /* eslint-disable camelcase */
@@ -163,34 +157,33 @@ describe('Contact', () => {
         /* eslint-enable camelcase */
       });
 
-    return Contact.modify(config, contactUuid, postBody)
-      .then(res => {
-        expect(res.email).to.be.equal('[email protected]');
-      });
+    const contact = await Contact.modify(config, contactUuid, postBody);
+    expect(contact.email).to.be.equal('[email protected]');
   });
 
-  it('deletes a contact', () => {
+  it('deletes a contact', async () => {
     const uuid = 'con_00000000-0000-0000-0000-000000000000';
 
     nock(config.API_BASE)
       .delete('/v1/contacts' + '/' + uuid)
       .reply(204);
 
-    return Contact.destroy(config, uuid);
+    const contact = await Contact.destroy(config, uuid);
+    // eslint-disable-next-line no-unused-expressions
+    expect(contact).to.be.empty;
   });
 
-  it('merges contacts', () => {
+  it('merges contacts', async () => {
     const intoUuid = 'con_00000000-0000-0000-0000-000000000000';
     const fromUuid = 'con_00000000-0000-0000-0000-000000000001';
 
     nock(config.API_BASE)
       .post(`/v1/contacts/${intoUuid}/merge/${fromUuid}`)
       .reply(200, {});
 
-    return Contact.merge(config, intoUuid, fromUuid)
-      .then(res => {
-        expect(200);
-        expect(res).to.be.instanceof(Object);
-      });
+    const result = await Contact.merge(config, intoUuid, fromUuid);
+    // eslint-disable-next-line no-unused-expressions
+    expect(result).to.empty;
+    expect(result).to.be.instanceof(Object);
   });
 });

test/chartmogul/custom-attribute.js

@@ -27,6 +27,8 @@ describe('CustomAttribute', () => {
     return CustomAttribute.add(config, customerUuid, postBody)
       .then(res => {
         expect(res).to.have.property('custom');
+        expect(res.custom.channel).to.be.equal('Facebook');
+        expect(res.custom.age).to.be.equal(8);
       });
   });
 

test/chartmogul/customer-note.js

@@ -27,18 +27,19 @@ describe('CustomerNote', () => {
         author: 'John Doe ([email protected])'
       });
 
-    CustomerNote.create(config, postBody)
+    return CustomerNote.create(config, postBody)
       .then(res => {
         expect(res.customer_uuid).to.be.equal(uuid);
         expect(res.text).to.be.equal('This is a note');
       });
   });
 
-  it('lists all notes from a customer', () => {
+  it('lists all notes from a customer', async () => {
     const uuid = 'cus_00000000-0000-0000-0000-000000000000';
+    const body = { customer_uuid: uuid, per_page: 10, cursor: 'cursor==' };
 
     nock(config.API_BASE)
-      .get('/v1/customer_notes')
+      .get(`/v1/customer_notes?customer_uuid=${uuid}&per_page=10&cursor=cursor==`)
       .reply(200, {
         entries: [{
           uuid: 'note_00000000-0000-0000-0000-000000000000',
@@ -51,10 +52,9 @@ describe('CustomerNote', () => {
         }]
       });
 
-    CustomerNote.all(config, uuid)
-      .then(res => {
-        expect(res.entries).to.haveLength(1);
-      });
+    const customerNote = await CustomerNote.all(config, body);
+    expect(customerNote.entries).to.have.lengthOf(1);
+    expect(customerNote.entries[0].customer_uuid).to.equal(uuid);
   });
 
   it('retrieves a customer note', () => {
@@ -72,8 +72,9 @@ describe('CustomerNote', () => {
         author: 'John Doe ([email protected])'
       });
 
-    CustomerNote.retrieve(config, uuid).then(res => {
+    return CustomerNote.retrieve(config, uuid).then(res => {
       expect(res).to.have.property('uuid');
+      expect(res.uuid).to.equal(uuid);
     });
   });
 
@@ -97,7 +98,7 @@ describe('CustomerNote', () => {
         /* eslint-enable camelcase */
       });
 
-    CustomerNote.patch(config, uuid, postBody)
+    return CustomerNote.patch(config, uuid, postBody)
       .then(res => {
         expect(res.text).to.be.equal('This is a note');
       });
@@ -110,9 +111,10 @@ describe('CustomerNote', () => {
       .delete(`/v1/customer_notes/${uuid}`)
       .reply(204);
 
-    CustomerNote.destroy(config, uuid)
+    return CustomerNote.destroy(config, uuid)
       .then(res => {
-        expect(res).to.be.equal({});
+        // eslint-disable-next-line no-unused-expressions
+        expect(res).to.be.empty;
       });
   });
 });