From eb671b6d13bd9ba3856b462613e50bbfebe1d628 Mon Sep 17 00:00:00 2001 From: Matthijs van Henten Date: Tue, 14 Apr 2015 13:42:00 +0000 Subject: [PATCH] convert tests to mocha --- node_modules/frontdoor/test/route.js | 46 ++++++++++++++------------ node_modules/frontdoor/test/section.js | 12 ++++--- 2 files changed, 32 insertions(+), 26 deletions(-) diff --git a/node_modules/frontdoor/test/route.js b/node_modules/frontdoor/test/route.js index 024abade..2d533ee9 100644 --- a/node_modules/frontdoor/test/route.js +++ b/node_modules/frontdoor/test/route.js @@ -3,9 +3,12 @@ var sinon = require("sinon"); var frontdoor = require('../frontdoor'); var Route = frontdoor.Route; -var test = require('tape'); +var assert = require('assert'); -test("test router: simple route with argument", function(assert) { +require("c9/inline-mocha")(module); +require("amd-loader"); + +it("test router: simple route with argument", function(done) { var route = new Route("/user/:name", sinon.stub()); var req = {}; @@ -15,10 +18,10 @@ test("test router: simple route with argument", function(assert) { assert.equal(route.match(req, "/user/fabian"), true); assert.equal(req.match.name, "fabian"); - assert.end(); + done(); }); -test("test router: simple route with number argument", function(assert) { +it("test router: simple route with number argument", function(done) { var route = new Route("/user/:id", { params: { id: { @@ -32,10 +35,10 @@ test("test router: simple route with number argument", function(assert) { assert.equal(route.match(req, "/user/123"), true); assert.equal(req.match.id, 123); - assert.end(); + done(); }); -test("test router: for params if the value is a string it is treated as the type", function(assert) { +it("test router: for params if the value is a string it is treated as the type", function(done) { var route = new Route("/user/:id", { params: { id: "int" @@ -46,10 +49,10 @@ test("test router: for params if the value is a string it is treated as the type assert.equal(route.match(req, "/user/123"), true); assert.equal(req.match.id, 123); - assert.end(); + done(); }); -test("test router: complex route with wildcard arguments", function(assert) { +it("test router: complex route with wildcard arguments", function(done) { var route = new Route("/user/:name/:rest*", { params: { id: { @@ -74,11 +77,11 @@ test("test router: complex route with wildcard arguments", function(assert) { assert.equal(req.match.name, "fabian"); assert.equal(req.match.rest, "/abc/123"); - assert.end(); + done(); }); -test("test router: complex route with multiple arguments", function(assert) { +it("test router: complex route with multiple arguments", function(done) { var route = new Route("/user/:name/:id", { params: { id: { @@ -95,11 +98,11 @@ test("test router: complex route with multiple arguments", function(assert) { assert.equal(req.match.id, 123); assert.equal(req.match.name, "fabian"); - assert.end(); + done(); }); -test("test regexp types", function(assert) { +it("test regexp types", function(done) { var route = new Route("/users/:uid", { params: { uid: /u\d+/ @@ -111,23 +114,23 @@ test("test regexp types", function(assert) { assert.ok(route.match(req, "/users/u123")); assert.ok(!route.match(req, "/users/_u123")); - assert.end(); + done(); }); -test("test custom type without register", function(assert) { +it("test custom type without register", function(done) { var DateType = { parse: function(string) { if (!/\d{13}/.test(string)) throw new Error("not a timestamp"); - + return new Date(parseInt(string, 10)); }, check: function(value) { return value instanceof Date; } }; - + var route = new Route("/ts/:ts", { params: { ts: { @@ -135,15 +138,14 @@ test("test custom type without register", function(assert) { } } }, sinon.stub()); - + var req = {}; - + assert.ok(route.match(req, "/ts/1353676299181")); assert.ok(req.match.ts instanceof Date); - + assert.ok(!route.match(req, "/ts/353676299181")); assert.ok(!route.match(req, "/ts/abc")); - - - assert.end(); + + done(); }); \ No newline at end of file diff --git a/node_modules/frontdoor/test/section.js b/node_modules/frontdoor/test/section.js index 476b3153..b54b6658 100644 --- a/node_modules/frontdoor/test/section.js +++ b/node_modules/frontdoor/test/section.js @@ -1,7 +1,11 @@ -var test = require('tape'); +var assert = require('assert-diff'); var Section = require('../frontdoor').Section; var Url = require('url'); +require("c9/inline-mocha")(module); +// require("amd-loader"); + + var mock = { req: function( method, uri) { var parsedUrl = Url.parse(uri||'', true); @@ -15,7 +19,7 @@ var mock = { } }; -test('Defines params on section level', function(assert, things, done) { +it('Defines params on section level', function(done) { var testParams = { required: { type: 'int', @@ -155,12 +159,12 @@ test('Defines params on section level', function(assert, things, done) { api.handle( req.pathname, req, {}, function(err) { if ( testCase.err ) { - assert.pass( 'route not matched: ' + testCase.label ); + assert.ok( 'route not matched: ' + testCase.label ); return; } assert.fail( 'route not matched: ' + testCase.label ); }); }); - assert.end(); + done(); });