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

Add accessor to get conflict details from iD.actions.MergeRemoteChanges

Browse Source
This commit is contained in:
Bryan Housel
2014-12-29 22:47:44 -05:00
parent b9ac4b95d1
commit 3bbf31902a
5 changed files with 94 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/actions/merge_remote_changes.js
+46 -2
View File
@@ -53,7 +53,36 @@ describe("iD.actions.MergeRemoteChanges", function () {
nodes: ['s1', 's2', 's3', 's4', 's1'],
version: '1',
tags: {foo: 'foo_new', area: 'yes'}
});
}),
saved, error;
// setup mock locale object..
beforeEach(function() {
saved = locale;
error = console.error;
console.error = function () {};
locale = {
_current: 'en',
en: {
"merge_remote_changes": {
"annotation": "Merged remote changes from server.",
"conflict": {
"general": "Conflicting edits were made to {type} {id} {name}",
"location": "Location was changed both locally and remotely.",
"nodelist": "Nodes were changed both locally and remotely.",
"memberlist": "Relation members were changed both locally and remotely.",
"tags": "Tag \"{tag}\" was changed to \"{local}\" locally and \"{remote}\" remotely."
}
}
}
};
});
afterEach(function() {
locale = saved;
console.error = error;
});
function makeGraph(entities) {
return _.reduce(entities, function(graph, entity) {
@@ -61,7 +90,6 @@ describe("iD.actions.MergeRemoteChanges", function () {
}, iD.Graph(base));
}
describe("non-destuctive merging", function () {
describe("nodes", function () {
it("doesn't merge nodes if location is different", function () {
@@ -272,6 +300,22 @@ describe("iD.actions.MergeRemoteChanges", function () {
expect(graph.entity('r').tags).to.eql({type: 'multipolygon', foo: 'foo_local', bar: 'bar_remote'});
});
});
describe("#conflicts", function () {
it("returns conflict details", function () {
var localLoc = [1, 1], // didn't move node
remoteLoc = [3, 3], // moved node
local = iD.Node({id: 'a', loc: localLoc, version: '1', v: 2}),
remote = iD.Node({id: 'a', loc: remoteLoc, version: '2'}),
graph = makeGraph([local]),
altGraph = makeGraph([remote]),
action = iD.actions.MergeRemoteChanges('a', graph, altGraph);
graph = action(graph);
expect(action.conflicts()).not.to.be.empty;
});
});
});
describe("destuctive merging", function () {