Skip to content

Commit

Permalink
[test] Use chai again
Browse files Browse the repository at this point in the history 
chai is a dependency of nock, so it gets installed anyway.
  • Loading branch information
@lpinca
lpinca committed Jan 10, 2016
1 parent 14324ca commit 11f1806
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 53 deletions.
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"request": "2.67.x"
},
"devDependencies": {
"chai": "3.4.x",
"istanbul": "0.4.x",
"mocha": "2.3.x",
"nock": "5.2.x",
Expand Down
14 changes: 7 additions & 7 deletions test/contact.test.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
describe('Freenom#contact', function () {
'use strict';

var common = require('./common')
var expect = require('chai').expect
, common = require('./common')
, qs = require('querystring')
, assert = require('assert')
, Freenom = require('..')
, nock = require('nock');

Expand Down Expand Up @@ -32,7 +32,7 @@ describe('Freenom#contact', function () {
freenom.contact.register(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -48,7 +48,7 @@ describe('Freenom#contact', function () {
freenom.contact.delete(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -64,7 +64,7 @@ describe('Freenom#contact', function () {
freenom.contact.getinfo(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -79,7 +79,7 @@ describe('Freenom#contact', function () {
freenom.contact.list(function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -95,7 +95,7 @@ describe('Freenom#contact', function () {
freenom.contact.list(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand Down
22 changes: 11 additions & 11 deletions test/domain.test.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
describe('Freenom#domain', function () {
'use strict';

var common = require('./common')
, assert = require('assert')
var expect = require('chai').expect
, common = require('./common')
, Freenom = require('..')
, nock = require('nock');

Expand All @@ -20,7 +20,7 @@ describe('Freenom#domain', function () {
freenom.domain.search(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -42,7 +42,7 @@ describe('Freenom#domain', function () {
freenom.domain.register(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -58,7 +58,7 @@ describe('Freenom#domain', function () {
freenom.domain.renew(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -74,7 +74,7 @@ describe('Freenom#domain', function () {
freenom.domain.getinfo(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -90,7 +90,7 @@ describe('Freenom#domain', function () {
freenom.domain.modify(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -106,7 +106,7 @@ describe('Freenom#domain', function () {
freenom.domain.delete(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -122,7 +122,7 @@ describe('Freenom#domain', function () {
freenom.domain.restore(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -142,7 +142,7 @@ describe('Freenom#domain', function () {
freenom.domain.upgrade(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -157,7 +157,7 @@ describe('Freenom#domain', function () {
freenom.domain.list(function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand Down
38 changes: 19 additions & 19 deletions test/freenom.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,42 +2,42 @@ describe('Freenom', function () {
'use strict';

var endpoints = require('../endpoints')
, expect = require('chai').expect
, common = require('./common')
, qs = require('querystring')
, assert = require('assert')
, Freenom = require('..')
, nock = require('nock');

it('exports the constructor', function () {
assert.ok(typeof Freenom === 'function');
expect(Freenom).to.be.a('function');
});

it('makes the new operator optional', function () {
assert.ok(Freenom() instanceof Freenom);
expect(Freenom()).to.be.an.instanceof(Freenom);
});

it('instantiates the endpoints lazily', function () {
var freenom = new Freenom()
, endpoint;

assert.strictEqual(freenom._domain, undefined);
expect(freenom._domain).to.equal(undefined);

endpoint = freenom.domain;

assert.strictEqual(freenom._domain, endpoint);
assert.strictEqual(freenom.domain, endpoint);
expect(freenom._domain).to.equal(endpoint);
expect(freenom.domain).to.equal(endpoint);
});

it('allows to manually instantiate an endpoint', function () {
var freenom = new Freenom()
, endpoint = new endpoints.Service(freenom);

assert.strictEqual(freenom._domain, undefined);
expect(freenom._domain).to.equal(undefined);

freenom.domain = endpoint;

assert.strictEqual(freenom._domain, endpoint);
assert.strictEqual(freenom.domain, endpoint);
expect(freenom._domain).to.equal(endpoint);
expect(freenom.domain).to.equal(endpoint);
});

it('allows to specify authentication credentials as parameters', function (done) {
Expand All @@ -52,7 +52,7 @@ describe('Freenom', function () {
freenom.domain.list(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -66,9 +66,9 @@ describe('Freenom', function () {
.replyWithError(message);

freenom.service.ping(function (err, res) {
assert.ok(err instanceof Error);
assert.strictEqual(err.message, message);
assert.strictEqual(res, undefined);
expect(err).to.be.an.instanceof(Error);
expect(err.message).to.equal(message);
expect(res).to.equal(undefined);
done();
});
});
Expand All @@ -81,9 +81,9 @@ describe('Freenom', function () {
.reply(500, '<!DOCTYPE html><html><head></head><body></body></html>');

freenom.service.ping(function (err, res) {
assert.ok(err instanceof Error);
assert.strictEqual(err.message, 'Failed to parse the response body');
assert.strictEqual(res, undefined);
expect(err).to.be.an.instanceof(Error);
expect(err.message).to.equal('Failed to parse the response body');
expect(res).to.equal(undefined);
done();
});
});
Expand All @@ -97,9 +97,9 @@ describe('Freenom', function () {
.reply(200, { status: 'error', error: 'Invalid domainname' });

freenom.domain.search(params, function (err, res) {
assert.ok(err instanceof Error);
assert.strictEqual(err.message, 'Invalid domainname');
assert.strictEqual(res, undefined);
expect(err).to.be.an.instanceof(Error);
expect(err.message).to.equal('Invalid domainname');
expect(res).to.equal(undefined);
done();
});
});
Expand Down
10 changes: 5 additions & 5 deletions test/nameserver.test.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
describe('Freenom#nameserver', function () {
'use strict';

var common = require('./common')
, assert = require('assert')
var expect = require('chai').expect
, common = require('./common')
, Freenom = require('..')
, nock = require('nock');

Expand All @@ -24,7 +24,7 @@ describe('Freenom#nameserver', function () {
freenom.nameserver.register(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -40,7 +40,7 @@ describe('Freenom#nameserver', function () {
freenom.nameserver.delete(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -56,7 +56,7 @@ describe('Freenom#nameserver', function () {
freenom.nameserver.list(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand Down
6 changes: 3 additions & 3 deletions test/service.test.js
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
describe('Freenom#service', function () {
'use strict';

var common = require('./common')
, assert = require('assert')
var expect = require('chai').expect
, common = require('./common')
, Freenom = require('..')
, nock = require('nock');

Expand All @@ -19,7 +19,7 @@ describe('Freenom#service', function () {
freenom.service.ping(function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand Down
16 changes: 8 additions & 8 deletions test/transfer.test.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
describe('Freenom#transfer', function () {
'use strict';

var common = require('./common')
var expect = require('chai').expect
, common = require('./common')
, qs = require('querystring')
, assert = require('assert')
, Freenom = require('..')
, nock = require('nock');

Expand All @@ -21,7 +21,7 @@ describe('Freenom#transfer', function () {
freenom.transfer.price(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -42,7 +42,7 @@ describe('Freenom#transfer', function () {
freenom.transfer.request(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -58,7 +58,7 @@ describe('Freenom#transfer', function () {
freenom.transfer.approve(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -74,7 +74,7 @@ describe('Freenom#transfer', function () {
freenom.transfer.decline(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -89,7 +89,7 @@ describe('Freenom#transfer', function () {
freenom.transfer.list(function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand All @@ -105,7 +105,7 @@ describe('Freenom#transfer', function () {
freenom.transfer.list(params, function (err, res) {
if (err) return done(err);

assert.deepEqual(res, result);
expect(res).to.deep.equal(result);
done();
});
});
Expand Down

0 comments on commit 11f1806

Please sign in to comment.