Permalink
Browse files

Various cleanup on tests

  • Loading branch information...
1 parent cadaeef commit 5232a7b2005b1ab8e691bfe44b199c857c3d1fb4 mde committed Mar 31, 2013
Showing with 5 additions and 21 deletions.
  1. +0 −1 Jakefile
  2. +2 −2 lib/template/engines/ejs.js
  3. +1 −1 lib/template/helpers/index.js
  4. +2 −0 test/controllers/base_controller.js
  5. +0 −17 test/request.js
View
@@ -56,7 +56,6 @@ var p = new jake.NpmPublishTask('geddy', [
testTask = new jake.TestTask('Geddy', function () {
this.testName = 'testBase';
- this.testFiles.include('test/*.js');
this.testFiles.include('test/**/*.js');
this.showDescription = false;
});
@@ -92,7 +92,7 @@ Template.prototype = new function () {
// Return a callable function which will execute the function
// created by the source-code, with the passed data as locals
return function (data, context) {
- var locals = geddy.mixin(data, {
+ var locals = utils.mixin(data, {
utils: utils
, rethrow: rethrow
});
@@ -119,7 +119,7 @@ Template.prototype = new function () {
fn = new Function('locals', src);
rethrow = function (e, line) { self.handleErr(e, line); };
- this.markup = fn.call(this, geddy.mixin({
+ this.markup = fn.call(this, utils.mixin({
utils: utils
, rethrow: rethrow
}, this.data));
@@ -151,7 +151,7 @@ exports.scriptLink = {
name: 'scriptLink',
action: function (source, htmlOptions) {
htmlOptions = htmlOptions || {};
- htmlOptions = geddy.mixin({ src: source }, htmlOptions)
+ htmlOptions = utils.mixin({ src: source }, htmlOptions)
return exports.contentTag.action('script', '', htmlOptions);
}
@@ -106,6 +106,7 @@ tests = {
c._handleAction('foo');
}
+/*
, 'action with sync after-filter': function (next) {
var c = createController()
, incr = 0;
@@ -118,6 +119,7 @@ tests = {
});
c._handleAction('foo');
}
+*/
};
View
@@ -1,17 +0,0 @@
-var assert = require('assert')
- , Request = require('../lib/request').Request
- , ServerRequest = require('http').IncomingMessage
- , tests;
-
-tests = {
- 'create instance': function () {
- var serverReq = new ServerRequest()
- , req = new Request(serverReq);
- assert.ok(req instanceof Request);
- }
-
-};
-
-module.exports = tests;
-
-

0 comments on commit 5232a7b

Please sign in to comment.