cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into docker-tests

Browse Source
This commit is contained in:
Simon Martín 2018-04-26 11:26:04 +02:00
commit fabff70e0a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/pg-entities-access-validator.js
View File

@ -20,7 +20,7 @@ const Validator = {
let softValidationResult = true;
if (!!affectedTables && affectedTables.tables) {
if (global.validatePGEntitiesAccess) {
if (global.settings.validatePGEntitiesAccess) {
hardValidationResult = this.hardValidation(affectedTables.tables);
}

4
test/acceptance/pg-entities-access-validator.js
View File

@ -26,7 +26,7 @@ describe('PG entities access validator', function () {
describe('validatePGEntitiesAccess enabled', function() {
before(function(){
global.validatePGEntitiesAccess = true;
global.settings.validatePGEntitiesAccess = true;
});
forbiddenQueries.forEach(query => {
@ -42,7 +42,7 @@ describe('PG entities access validator', function () {
describe('validatePGEntitiesAccess disabled', function() {
before(function(){
global.validatePGEntitiesAccess = false;
global.settings.validatePGEntitiesAccess = false;
});
forbiddenQueries.forEach(query => {

4
test/unit/pg-entities-access-validator.test.js
View File

@ -73,11 +73,11 @@ const fakeAffectedTablesTopologyKO = [
describe('pg entities access validator with validatePGEntitiesAccess enabled', function () {
before(function() {
global.validatePGEntitiesAccess = true;
global.settings.validatePGEntitiesAccess = true;
});
after(function() {
global.validatePGEntitiesAccess = false;
global.settings.validatePGEntitiesAccess = false;
});
it('validate function: bad parameters', function () {