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

Stop bundling wmf-sitematrix, move it extern

Browse Source 
This also includes a bunch of tweaks to make the tests work
in both PhantomJS and modern browsers like Chrome.

Basically - introduce some more async into the test code so that
the coreData.get promise is guaranteed to settle.  Because in
PhantomJS the promise is polyfilled, and Chrome it's native, they
work slightly differently.
This commit is contained in:
Bryan Housel
2020-01-29 12:30:11 -05:00
parent 567eeac587
commit c481f90e7d
8 changed files with 366 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/validations/outdated_tags.js
+69 -42
View File
@@ -9,7 +9,7 @@ describe('iD.validations.outdated_tags', function () {
});
after(function() {
delete iD.data.deprecated;
iD.data.deprecated = [];
});
beforeEach(function() {
@@ -45,8 +45,7 @@ describe('iD.validations.outdated_tags', function () {
);
}
function validate() {
var validator = iD.validationOutdatedTags(context);
function validate(validator) {
var changes = context.history().changes();
var entities = changes.modified.concat(changes.created);
var issues = [];
@@ -56,63 +55,91 @@ describe('iD.validations.outdated_tags', function () {
return issues;
}
it('has no errors on init', function() {
var issues = validate();
expect(issues).to.have.lengthOf(0);
it('has no errors on init', function(done) {
var validator = iD.validationOutdatedTags(context);
window.setTimeout(function() { // async, so data will be available
var issues = validate(validator);
expect(issues).to.have.lengthOf(0);
done();
}, 20);
});
it('has no errors on good tags', function() {
it('has no errors on good tags', function(done) {
createWay({'highway': 'unclassified'});
var issues = validate();
expect(issues).to.have.lengthOf(0);
var validator = iD.validationOutdatedTags(context);
window.setTimeout(function() { // async, so data will be available
var issues = validate(validator);
expect(issues).to.have.lengthOf(0);
done();
}, 20);
});
it('flags deprecated tag with replacement', function() {
it('flags deprecated tag with replacement', function(done) {
createWay({'highway': 'ford'});
var issues = validate();
expect(issues).to.have.lengthOf(1);
var issue = issues[0];
expect(issue.type).to.eql('outdated_tags');
expect(issue.subtype).to.eql('deprecated_tags');
expect(issue.severity).to.eql('warning');
expect(issue.entityIds).to.have.lengthOf(1);
expect(issue.entityIds[0]).to.eql('w-1');
var validator = iD.validationOutdatedTags(context);
window.setTimeout(function() { // async, so data will be available
var issues = validate(validator);
expect(issues).to.have.lengthOf(1);
var issue = issues[0];
expect(issue.type).to.eql('outdated_tags');
expect(issue.subtype).to.eql('deprecated_tags');
expect(issue.severity).to.eql('warning');
expect(issue.entityIds).to.have.lengthOf(1);
expect(issue.entityIds[0]).to.eql('w-1');
done();
}, 20);
});
it('flags deprecated tag with no replacement', function() {
it('flags deprecated tag with no replacement', function(done) {
createWay({'highway': 'no'});
var issues = validate();
expect(issues).to.have.lengthOf(1);
var issue = issues[0];
expect(issue.type).to.eql('outdated_tags');
expect(issue.subtype).to.eql('deprecated_tags');
expect(issue.severity).to.eql('warning');
expect(issue.entityIds).to.have.lengthOf(1);
expect(issue.entityIds[0]).to.eql('w-1');
var validator = iD.validationOutdatedTags(context);
window.setTimeout(function() { // async, so data will be available
var issues = validate(validator);
expect(issues).to.have.lengthOf(1);
var issue = issues[0];
expect(issue.type).to.eql('outdated_tags');
expect(issue.subtype).to.eql('deprecated_tags');
expect(issue.severity).to.eql('warning');
expect(issue.entityIds).to.have.lengthOf(1);
expect(issue.entityIds[0]).to.eql('w-1');
done();
}, 20);
});
it('ignores way with no relations', function() {
it('ignores way with no relations', function(done) {
createWay({});
var issues = validate();
expect(issues).to.have.lengthOf(0);
var validator = iD.validationOutdatedTags(context);
window.setTimeout(function() { // async, so data will be available
var issues = validate(validator);
expect(issues).to.have.lengthOf(0);
done();
}, 20);
});
it('ignores multipolygon tagged on the relation', function() {
it('ignores multipolygon tagged on the relation', function(done) {
createRelation({}, { type: 'multipolygon', building: 'yes' });
var issues = validate();
expect(issues).to.have.lengthOf(0);
var validator = iD.validationOutdatedTags(context);
window.setTimeout(function() { // async, so data will be available
var issues = validate(validator);
expect(issues).to.have.lengthOf(0);
done();
}, 20);
});
it('flags multipolygon tagged on the outer way', function() {
it('flags multipolygon tagged on the outer way', function(done) {
createRelation({ building: 'yes' }, { type: 'multipolygon' });
var issues = validate();
expect(issues).to.not.have.lengthOf(0);
var issue = issues[0];
expect(issue.type).to.eql('outdated_tags');
expect(issue.subtype).to.eql('old_multipolygon');
expect(issue.entityIds).to.have.lengthOf(2);
expect(issue.entityIds[0]).to.eql('w-1');
expect(issue.entityIds[1]).to.eql('r-1');
var validator = iD.validationOutdatedTags(context);
window.setTimeout(function() { // async, so data will be available
var issues = validate(validator);
expect(issues).to.not.have.lengthOf(0);
var issue = issues[0];
expect(issue.type).to.eql('outdated_tags');
expect(issue.subtype).to.eql('old_multipolygon');
expect(issue.entityIds).to.have.lengthOf(2);
expect(issue.entityIds[0]).to.eql('w-1');
expect(issue.entityIds[1]).to.eql('r-1');
done();
}, 20);
});
});