CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-06-02 21:21:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Convert validation rules to validate against a specific graph, not always the current graph (re: #6459)

Browse Source
This commit is contained in:
Quincy Morgan
2019-06-06 16:27:31 -04:00
parent 5f0f77cc2c
commit 1ed73b6531
31 changed files with 577 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/services/maprules.js
+2 -2
View File
@@ -562,10 +562,10 @@ describe('maprules', function() {
expect(issues.length).to.eql(1);
expect(issue.entityIds).to.eql([entity.id]);
expect(issue.message()).to.eql(selector[type]);
expect(issue.message(context)).to.eql(selector[type]);
expect(type).to.eql(issue.severity);
});
});
});
});
});
});
test/spec/validations/almost_junction.js
+4 -4
View File
@@ -127,12 +127,12 @@ describe('iD.validations.almost_junction', function () {
}
function validate() {
var validator = iD.validationAlmostJunction();
var validator = iD.validationAlmostJunction(context);
var changes = context.history().changes();
var entities = changes.modified.concat(changes.created);
var issues = [];
entities.forEach(function(entity) {
issues = issues.concat(validator(entity, context));
issues = issues.concat(validator(entity, context.graph()));
});
return issues;
}
@@ -166,7 +166,7 @@ describe('iD.validations.almost_junction', function () {
expect(issue.data.cross_loc[1]).to.eql(0);
expect(issue.fixes).to.have.lengthOf(2);
issue.fixes[0].onClick();
issue.fixes[0].onClick(context);
issues = validate();
expect(issues).to.have.lengthOf(0);
});
@@ -195,7 +195,7 @@ describe('iD.validations.almost_junction', function () {
expect(issue.data.cross_loc[1]).to.eql(0);
expect(issue.fixes).to.have.lengthOf(2);
issue.fixes[1].onClick();
issue.fixes[1].onClick(context);
issues = validate();
expect(issues).to.have.lengthOf(0);
});
test/spec/validations/crossing_ways.js
+2 -2
View File
@@ -54,12 +54,12 @@ describe('iD.validations.crossing_ways', function () {
}
function validate() {
var validator = iD.validationCrossingWays();
var validator = iD.validationCrossingWays(context);
var changes = context.history().changes();
var entities = changes.modified.concat(changes.created);
var issues = [];
entities.forEach(function(entity) {
issues = issues.concat(validator(entity, context));
issues = issues.concat(validator(entity, context.graph()));
});
return issues;
}
test/spec/validations/disconnected_way.js
+2 -2
View File
@@ -34,12 +34,12 @@ describe('iD.validations.disconnected_way', function () {
}
function validate() {
var validator = iD.validationDisconnectedWay();
var validator = iD.validationDisconnectedWay(context);
var changes = context.history().changes();
var entities = changes.modified.concat(changes.created);
var issues = [];
entities.forEach(function(entity) {
issues = issues.concat(validator(entity, context));
issues = issues.concat(validator(entity, context.graph()));
});
return issues;
}
test/spec/validations/generic_name.js
+2 -2
View File
@@ -20,12 +20,12 @@ describe('iD.validations.generic_name', function () {
}
function validate() {
var validator = iD.validationGenericName();
var validator = iD.validationGenericName(context);
var changes = context.history().changes();
var entities = changes.modified.concat(changes.created);
var issues = [];
entities.forEach(function(entity) {
issues = issues.concat(validator(entity, context));
issues = issues.concat(validator(entity, context.graph()));
});
return issues;
}
test/spec/validations/incompatible_source.js
+2 -2
View File
@@ -20,12 +20,12 @@ describe('iD.validations.incompatible_source', function () {
}
function validate() {
var validator = iD.validationIncompatibleSource();
var validator = iD.validationIncompatibleSource(context);
var changes = context.history().changes();
var entities = changes.modified.concat(changes.created);
var issues = [];
entities.forEach(function(entity) {
issues = issues.concat(validator(entity, context));
issues = issues.concat(validator(entity, context.graph()));
});
return issues;
}
test/spec/validations/missing_role.js
+2 -2
View File
@@ -34,12 +34,12 @@ describe('iD.validations.missing_role', function () {
}
function validate() {
var validator = iD.validationMissingRole();
var validator = iD.validationMissingRole(context);
var changes = context.history().changes();
var entities = changes.modified.concat(changes.created);
var issues = [];
entities.forEach(function(entity) {
issues = issues.concat(validator(entity, context));
issues = issues.concat(validator(entity, context.graph()));
});
return issues;
}
test/spec/validations/missing_tag.js
+2 -2
View File
@@ -34,12 +34,12 @@ describe('iD.validations.missing_tag', function () {
}
function validate() {
var validator = iD.validationMissingTag();
var validator = iD.validationMissingTag(context);
var changes = context.history().changes();
var entities = changes.modified.concat(changes.created);
var issues = [];
entities.forEach(function(entity) {
issues = issues.concat(validator(entity, context));
issues = issues.concat(validator(entity, context.graph()));
});
return issues;
}
test/spec/validations/outdated_tags.js
+2 -2
View File
@@ -34,12 +34,12 @@ describe('iD.validations.outdated_tags', function () {
}
function validate() {
var validator = iD.validationOutdatedTags();
var validator = iD.validationOutdatedTags(context);
var changes = context.history().changes();
var entities = changes.modified.concat(changes.created);
var issues = [];
entities.forEach(function(entity) {
issues = issues.concat(validator(entity, context));
issues = issues.concat(validator(entity, context.graph()));
});
return issues;
}
test/spec/validations/private_data.js
+2 -2
View File
@@ -20,12 +20,12 @@ describe('iD.validations.private_data', function () {
}
function validate() {
var validator = iD.validationPrivateData();
var validator = iD.validationPrivateData(context);
var changes = context.history().changes();
var entities = changes.modified.concat(changes.created);
var issues = [];
entities.forEach(function(entity) {
issues = issues.concat(validator(entity, context));
issues = issues.concat(validator(entity, context.graph()));
});
return issues;
}
test/spec/validations/tag_suggests_area.js
+2 -2
View File
@@ -41,12 +41,12 @@ describe('iD.validations.tag_suggests_area', function () {
}
function validate() {
var validator = iD.validationTagSuggestsArea();
var validator = iD.validationTagSuggestsArea(context);
var changes = context.history().changes();
var entities = changes.modified.concat(changes.created);
var issues = [];
entities.forEach(function(entity) {
issues = issues.concat(validator(entity, context));
issues = issues.concat(validator(entity, context.graph()));
});
return issues;
}