cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change error message

Browse Source
This commit is contained in:
Daniel García Aubert 2017-08-01 15:03:09 +02:00
parent 262f854e68
commit 0594407b38
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cartodb/controllers/base.js
View File

@ -331,7 +331,7 @@ function populateTimeoutErrors (errors) {
}
if (isTimeoutError(error)) {
error.message = 'You are over platform limits. Please contact us to know more details';
error.message = 'You are over platform\'s limits. Please contact us to know more details';
error.type = 'limit';
error.http_status = 429;
}

4
test/acceptance/limits.js
View File

@ -107,7 +107,7 @@ describe('render limits', function() {
function(res) {
var parsed = JSON.parse(res.body);
assert.deepEqual(parsed.errors, [
'You are over platform limits. Please contact us to know more details'
'You are over platform\'s limits. Please contact us to know more details'
]);
done();
}
@ -174,7 +174,7 @@ describe('render limits', function() {
function(res) {
var parsed = JSON.parse(res.body);
assert.deepEqual(parsed.errors, [
'You are over platform limits. Please contact us to know more details'
'You are over platform\'s limits. Please contact us to know more details'
]);
done();
}

24
test/acceptance/user-database-timeout-limit.js
View File

@ -68,11 +68,11 @@ const createMapConfig = ({
});
const DATASOURCE_TIMEOUT_ERROR = {
errors: ['You are over platform limits. Please contact us to know more details'],
errors: ['You are over platform\'s limits. Please contact us to know more details'],
errors_with_context: [{
type: 'limit',
subtype: 'datasource',
message: 'You are over platform limits. Please contact us to know more details'
message: 'You are over platform\'s limits. Please contact us to know more details'
}]
};
@ -140,11 +140,11 @@ describe('user database timeout limit', function () {
this.testClient.getLayergroup(expectedResponse, (err, timeoutError) => {
assert.deepEqual(timeoutError, {
errors: [ 'You are over platform limits. Please contact us to know more details' ],
errors: [ 'You are over platform\'s limits. Please contact us to know more details' ],
errors_with_context: [{
type: 'limit',
subtype: 'datasource',
message: 'You are over platform limits. Please contact us to know more details',
message: 'You are over platform\'s limits. Please contact us to know more details',
layer: { id: 'layer0', index: 0, type: 'mapnik' }
}]
});
@ -348,11 +348,11 @@ describe('user database timeout limit', function () {
this.testClient.getLayergroup(expectedResponse, (err, timeoutError) => {
assert.deepEqual(timeoutError, {
errors: [ 'You are over platform limits. Please contact us to know more details' ],
errors: [ 'You are over platform\'s limits. Please contact us to know more details' ],
errors_with_context: [{
type: 'limit',
subtype: 'datasource',
message: 'You are over platform limits. Please contact us to know more details',
message: 'You are over platform\'s limits. Please contact us to know more details',
layer: { id: 'layer0', index: 0, type: 'mapnik' }
}]
});
@ -450,11 +450,11 @@ describe('user database timeout limit', function () {
this.testClient.getLayergroup(expectedResponse, (err, timeoutError) => {
assert.deepEqual(timeoutError, {
errors: [ 'You are over platform limits. Please contact us to know more details' ],
errors: [ 'You are over platform\'s limits. Please contact us to know more details' ],
errors_with_context: [{
type: 'limit',
subtype: 'datasource',
message: 'You are over platform limits. Please contact us to know more details',
message: 'You are over platform\'s limits. Please contact us to know more details',
layer: { id: 'layer0', index: 0, type: 'mapnik' }
}]
});
@ -554,11 +554,11 @@ describe('user database timeout limit', function () {
this.testClient.getLayergroup(expectedResponse, (err, timeoutError) => {
assert.deepEqual(timeoutError, {
errors: [ 'You are over platform limits. Please contact us to know more details' ],
errors: [ 'You are over platform\'s limits. Please contact us to know more details' ],
errors_with_context: [{
type: 'limit',
subtype: 'datasource',
message: 'You are over platform limits. Please contact us to know more details',
message: 'You are over platform\'s limits. Please contact us to know more details',
layer: { id: 'torque-layer0', index: 0, type: 'torque' }
}]
});
@ -685,11 +685,11 @@ describe('user database timeout limit', function () {
this.testClient.getLayergroup(expectedResponse, (err, timeoutError) => {
assert.deepEqual(timeoutError, {
errors: [ 'You are over platform limits. Please contact us to know more details' ],
errors: [ 'You are over platform\'s limits. Please contact us to know more details' ],
errors_with_context: [{
type: 'limit',
subtype: 'datasource',
message: 'You are over platform limits. Please contact us to know more details',
message: 'You are over platform\'s limits. Please contact us to know more details',
layer: {
id: 'layer0',
index: 0,

20
test/acceptance/user-render-timeout-limit.js
View File

@ -95,11 +95,11 @@ describe('user render timeout limit', function () {
assert.ifError(err);
assert.deepEqual(timeoutError, {
errors: ["You are over platform limits. Please contact us to know more details"],
errors: ["You are over platform\'s limits. Please contact us to know more details"],
errors_with_context: [{
type: 'limit',
subtype: 'render',
message: "You are over platform limits. Please contact us to know more details",
message: "You are over platform\'s limits. Please contact us to know more details",
layer: {
id: "layer0",
index: 0,
@ -186,11 +186,11 @@ describe('user render timeout limit', function () {
assert.ifError(err);
assert.deepEqual(timeoutError, {
errors: ["You are over platform limits. Please contact us to know more details"],
errors: ["You are over platform\'s limits. Please contact us to know more details"],
errors_with_context: [{
type: 'limit',
subtype: 'render',
message: "You are over platform limits. Please contact us to know more details"
message: "You are over platform\'s limits. Please contact us to know more details"
}]
});
@ -231,11 +231,11 @@ describe('user render timeout limit', function () {
assert.ifError(err);
assert.deepEqual(tile, {
errors: ['You are over platform limits. Please contact us to know more details'],
errors: ['You are over platform\'s limits. Please contact us to know more details'],
errors_with_context: [{
type: 'limit',
subtype: 'render',
message: 'You are over platform limits. Please contact us to know more details'
message: 'You are over platform\'s limits. Please contact us to know more details'
}]
});
@ -276,11 +276,11 @@ describe('user render timeout limit', function () {
assert.ifError(err);
assert.deepEqual(tile, {
errors: ['You are over platform limits. Please contact us to know more details'],
errors: ['You are over platform\'s limits. Please contact us to know more details'],
errors_with_context: [{
type: 'limit',
subtype: 'render',
message: 'You are over platform limits. Please contact us to know more details'
message: 'You are over platform\'s limits. Please contact us to know more details'
}]
});
@ -377,11 +377,11 @@ describe('user render timeout limit', function () {
assert.ifError(err);
assert.deepEqual(timeoutError, {
errors: ["You are over platform limits. Please contact us to know more details"],
errors: ["You are over platform\'s limits. Please contact us to know more details"],
errors_with_context: [{
type: 'limit',
subtype: 'render',
message: "You are over platform limits. Please contact us to know more details"
message: "You are over platform\'s limits. Please contact us to know more details"
}]
});