Rename yellowlabtools.js to index.js and change the way to call it
This commit is contained in:
@@ -3,7 +3,7 @@ var Q = require('q');
|
||||
var Runner = require('./runner');
|
||||
|
||||
|
||||
var YellowLabTools = function(url, options) {
|
||||
var yellowLabTools = function(url, options) {
|
||||
'use strict';
|
||||
|
||||
var deferred = Q.defer();
|
||||
@@ -35,4 +35,4 @@ var YellowLabTools = function(url, options) {
|
||||
return deferred.promise;
|
||||
};
|
||||
|
||||
module.exports = YellowLabTools;
|
||||
module.exports = yellowLabTools;
|
||||
@@ -1,6 +1,6 @@
|
||||
var debug = require('debug')('ylt:server');
|
||||
|
||||
var YellowLabTools = require('../../yellowlabtools');
|
||||
var ylt = require('../../index');
|
||||
var RunsQueue = require('../datastores/runsQueue');
|
||||
var RunsDatastore = require('../datastores/runsDatastore');
|
||||
var ResultsDatastore = require('../datastores/resultsDatastore');
|
||||
@@ -49,7 +49,8 @@ var ApiController = function(app) {
|
||||
|
||||
debug('Launching test %s on %s', run.runId, run.params.url);
|
||||
|
||||
new YellowLabTools(run.params.url)
|
||||
ylt(run.params.url)
|
||||
|
||||
.then(function(data) {
|
||||
|
||||
debug('Success');
|
||||
@@ -92,7 +93,9 @@ var ApiController = function(app) {
|
||||
res.status(500).send('Saving results failed');
|
||||
});
|
||||
|
||||
}).fail(function(err) {
|
||||
})
|
||||
|
||||
.fail(function(err) {
|
||||
|
||||
console.error('Test failed for URL: %s', run.params.url);
|
||||
console.error(err.toString());
|
||||
@@ -101,7 +104,9 @@ var ApiController = function(app) {
|
||||
|
||||
res.status(400).send('Bad request');
|
||||
|
||||
}).finally(function() {
|
||||
})
|
||||
|
||||
.finally(function() {
|
||||
queue.remove(run.runId);
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user