diff --git a/.travis.yml b/.travis.yml index f0be6ebb..f5ae9ee8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: precise addons: apt: sources: diff --git a/NEWS.md b/NEWS.md index 6cb8ecc8..529fde2b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -3,6 +3,9 @@ ## 1.47.2 Released 2017-mm-dd +Announcements: + * Change work in progress jobs endpoint from `[..]/job/wip` to `[..]/jobs-wip` + ## 1.47.1 Released 2017-08-13 diff --git a/app/controllers/job_controller.js b/app/controllers/job_controller.js index f600bd19..63e63274 100644 --- a/app/controllers/job_controller.js +++ b/app/controllers/job_controller.js @@ -49,8 +49,7 @@ JobController.prototype.route = function (app) { this.createJob.bind(this) ); app.get( - global.settings.base_url + '/sql/job/wip', - userMiddleware, authenticatedMiddleware(this.userDatabaseService), + global.settings.base_url + '/jobs-wip', this.listWorkInProgressJobs.bind(this) ); app.get( @@ -96,8 +95,6 @@ JobController.prototype.listWorkInProgressJobs = function (req, res) { return handleException(err, res); } - res.header('X-Served-By-DB-Host', req.context.userDatabase.host); - req.profiler.done('list'); req.profiler.end(); req.profiler.sendStats(); diff --git a/test/support/batch-test-client.js b/test/support/batch-test-client.js index b39d3887..ac471dbb 100644 --- a/test/support/batch-test-client.js +++ b/test/support/batch-test-client.js @@ -109,7 +109,7 @@ BatchTestClient.prototype.getWorkInProgressJobs = function(override, callback) { assert.response( this.server, { - url: this.getUrl(override, 'wip'), + url: '/api/v1/jobs-wip', headers: { host: this.getHost(override) },