Use moment.js for timestamps on common.log.
Also add loaderOptions.paths to intern config Conflicts: test/intern.js
This commit is contained in:
parent
68424f32ec
commit
167fdcd716
2 changed files with 9 additions and 2 deletions
|
@ -15,6 +15,12 @@ define(function (require) {
|
|||
'test/functional/status.js',
|
||||
'test/functional/testSettings'
|
||||
],
|
||||
excludeInstrumentation: /(fixtures|node_modules)\//
|
||||
excludeInstrumentation: /(fixtures|node_modules)\//,
|
||||
loaderOptions: {
|
||||
paths: {
|
||||
'bluebird': './node_modules/bluebird/js/browser/bluebird.js',
|
||||
'moment': './node_modules/moment/moment.js'
|
||||
}
|
||||
}
|
||||
}, serverConfig);
|
||||
});
|
||||
|
|
|
@ -4,6 +4,7 @@ define(function (require) {
|
|||
var registerSuite = require('intern!object');
|
||||
var expect = require('intern/dojo/node!expect.js');
|
||||
var Promise = require('bluebird');
|
||||
var moment = require('moment');
|
||||
|
||||
|
||||
// the page object is created as a constructor
|
||||
|
@ -49,7 +50,7 @@ define(function (require) {
|
|||
|
||||
|
||||
log: function log(logString) {
|
||||
console.log(Date.now() + ' : ' + logString);
|
||||
console.log(moment().format('hh:mm:ss.SSS') + ': ' + logString);
|
||||
},
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue