Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to lab (from mocha) #649

Merged
merged 2 commits into from
Mar 10, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
REPORTER = dot

test:
@NODE_ENV=test ./node_modules/.bin/mocha --recursive --reporter $(REPORTER) --ignore-leaks --timeout 3000

test-cov:
@NODE_ENV=test ./node_modules/.bin/mocha --require blanket --recursive --ignore-leaks --timeout 3000 -R travis-cov

@./node_modules/.bin/lab
test-cov:
@./node_modules/.bin/lab -r threshold -t 100
test-cov-html:
@NODE_ENV=test ./node_modules/.bin/mocha --require blanket --recursive --ignore-leaks --timeout 3000 -R html-cov > coverage.html

@./node_modules/.bin/lab -r html -o coverage.html
complexity:
./node_modules/.bin/cr -o complexity.md -f markdown lib
@./node_modules/.bin/cr -o complexity.md -f markdown lib

.PHONY: test test-cov test-cov-html complexity

.PHONY: test test-cov test-cov-html
9 changes: 2 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,17 @@
"negotiator": "0.2.x"
},
"devDependencies": {
"mocha": "1.x.x",
"chai": "1.x.x",
"sinon": "1.x.x",
"lab": "0.0.x",
"handlebars": "1.0.x",
"jade": "0.28.x",
"blanket": "1.0.x",
"travis-cov": "0.2.x",
"complexity-report": "0.x.x"
},
"bin": {
"hapi": "./bin/hapi"
},
"scripts": {
"test": "make test && make test-cov",
"blanket": { "pattern": "//^((?!\/node_modules\/)(?!\/test\/helpers\/)(?!\/test\/unit\/)(?!\/test\/integration\/).)*$/ig", "onlyCwd": true, "data-cover-flags": { "branchTracking": true } },
"travis-cov": { "threshold": 100 }
"blanket": { "pattern": "//^((?!\/node_modules\/)(?!\/test\/).)*$/ig", "onlyCwd": true, "data-cover-flags": { "branchTracking": true } }
},
"licenses": [
{
Expand Down
8 changes: 6 additions & 2 deletions test/integration/auth.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Load modules

var Crypto = require('crypto');
var Chai = require('chai');
var Lab = require('lab');
var Oz = require('oz');
var Hawk = require('hawk');
var Hapi = require('../..');
Expand All @@ -14,7 +14,11 @@ var internals = {};

// Test shortcuts

var expect = Chai.expect;
var expect = Lab.expect;
var before = Lab.before;
var after = Lab.after;
var describe = Lab.experiment;
var it = Lab.test;


describe('Auth', function () {
Expand Down
8 changes: 6 additions & 2 deletions test/integration/cache.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Load modules

var Chai = require('chai');
var Lab = require('lab');
var Stream = require('stream');
var Hapi = require('../..');

Expand All @@ -12,7 +12,11 @@ var internals = {};

// Test shortcuts

var expect = Chai.expect;
var expect = Lab.expect;
var before = Lab.before;
var after = Lab.after;
var describe = Lab.experiment;
var it = Lab.test;


describe('Cache', function () {
Expand Down
8 changes: 6 additions & 2 deletions test/integration/clientTimeout.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Load modules

var Chai = require('chai');
var Lab = require('lab');
var Http = require('http');
var Stream = require('stream');
var Hapi = require('../..');
Expand All @@ -13,7 +13,11 @@ var internals = {};

// Test shortcuts

var expect = Chai.expect;
var expect = Lab.expect;
var before = Lab.before;
var after = Lab.after;
var describe = Lab.experiment;
var it = Lab.test;


describe('Client Timeout', function () {
Expand Down
8 changes: 6 additions & 2 deletions test/integration/composer.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Load modules

var Chai = require('chai');
var Lab = require('lab');
var Hapi = require('../..');


Expand All @@ -11,7 +11,11 @@ var internals = {};

// Test shortcuts

var expect = Chai.expect;
var expect = Lab.expect;
var before = Lab.before;
var after = Lab.after;
var describe = Lab.experiment;
var it = Lab.test;


describe('Composer', function () {
Expand Down
8 changes: 6 additions & 2 deletions test/integration/ext.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Load modules

var Chai = require('chai');
var Lab = require('lab');
var Hapi = require('../..');


Expand All @@ -11,7 +11,11 @@ var internals = {};

// Test shortcuts

var expect = Chai.expect;
var expect = Lab.expect;
var before = Lab.before;
var after = Lab.after;
var describe = Lab.experiment;
var it = Lab.test;


describe('Ext', function () {
Expand Down
8 changes: 6 additions & 2 deletions test/integration/gzip.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Load modules

var Chai = require('chai');
var Lab = require('lab');
var Zlib = require('zlib');
var Request = require('request');
var Hapi = require('../..');
Expand All @@ -13,7 +13,11 @@ var internals = {};

// Test shortcuts

var expect = Chai.expect;
var expect = Lab.expect;
var before = Lab.before;
var after = Lab.after;
var describe = Lab.experiment;
var it = Lab.test;


describe('Payload', function () {
Expand Down
8 changes: 6 additions & 2 deletions test/integration/notFound.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Load modules

var Chai = require('chai');
var Lab = require('lab');
var Hapi = require('../..');


Expand All @@ -11,7 +11,11 @@ var internals = {};

// Test shortcuts

var expect = Chai.expect;
var expect = Lab.expect;
var before = Lab.before;
var after = Lab.after;
var describe = Lab.experiment;
var it = Lab.test;


describe('NotFound', function () {
Expand Down
8 changes: 6 additions & 2 deletions test/integration/pack.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Load modules

var Chai = require('chai');
var Lab = require('lab');
var Hapi = require('../..');


Expand All @@ -11,7 +11,11 @@ var internals = {};

// Test shortcuts

var expect = Chai.expect;
var expect = Lab.expect;
var before = Lab.before;
var after = Lab.after;
var describe = Lab.experiment;
var it = Lab.test;


describe('Pack', function () {
Expand Down
8 changes: 6 additions & 2 deletions test/integration/payload.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Load modules

var Chai = require('chai');
var Lab = require('lab');
var Request = require('request');
var Fs = require('fs');
var Http = require('http');
Expand All @@ -17,7 +17,11 @@ var internals = {};

// Test shortcuts

var expect = Chai.expect;
var expect = Lab.expect;
var before = Lab.before;
var after = Lab.after;
var describe = Lab.experiment;
var it = Lab.test;


describe('Payload', function () {
Expand Down
8 changes: 6 additions & 2 deletions test/integration/prerequisites.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Load modules

var Chai = require('chai');
var Lab = require('lab');
var Hapi = require('../..');


Expand All @@ -11,7 +11,11 @@ var internals = {};

// Test shortcuts

var expect = Chai.expect;
var expect = Lab.expect;
var before = Lab.before;
var after = Lab.after;
var describe = Lab.experiment;
var it = Lab.test;


describe('Prerequesites', function () {
Expand Down
Loading