CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-03-03 09:53:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update tests to not allow closed way to disconnect itself.

Browse Source
This commit is contained in:
Bryan Housel
2014-03-30 23:06:39 -04:00
parent 48dedb15ed
commit 5afcbf9400
1 changed files with 3 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/spec/actions/disconnect.js
View File

@@ -6,7 +6,7 @@ describe("iD.actions.Disconnect", function () {
expect(iD.actions.Disconnect('a').disabled(graph)).to.equal('not_connected');
});
it("returns falsy for a node appearing twice in the same way", function () {
it("returns 'not_connected' for a node appearing twice in the same way", function () {
// a ---- b
// | |
// d ---- c
@@ -17,7 +17,7 @@ describe("iD.actions.Disconnect", function () {
iD.Node({id: 'd'}),
iD.Way({id: 'w', nodes: ['a', 'b', 'c', 'd', 'a']})
]);
expect(iD.actions.Disconnect('a').disabled(graph)).not.to.be.ok;
expect(iD.actions.Disconnect('a').disabled(graph)).to.equal('not_connected');
});
it("returns falsy for a node shared by two or more ways", function () {
@@ -41,7 +41,7 @@ describe("iD.actions.Disconnect", function () {
iD.Node({id: 'a'}),
iD.Node({id: 'b'}),
iD.Node({id: 'c'}),
iD.Node({id: 'c'}),
iD.Node({id: 'd'}),
iD.Node({id: '*'}),
iD.Way({id: '-', nodes: ['a', '*', 'b']}),
iD.Way({id: '|', nodes: ['*', 'd']})
@@ -109,25 +109,6 @@ describe("iD.actions.Disconnect", function () {
expect(graph.entity('|').nodes).to.eql(['d', 'b']);
});
it("replaces later occurrences in a self-intersecting way", function() {
// Situtation:
// a ---- b
// \_ |
// \__ c
// Disconnect at a
//
// Expected result:
// a ---- b ---- c ---- d
var graph = iD.Graph([
iD.Node({id: 'a'}),
iD.Node({id: 'b'}),
iD.Node({id: 'c'}),
iD.Way({id: 'w', nodes: ['a', 'b', 'c', 'a']})
]);
graph = iD.actions.Disconnect('a', 'd')(graph);
expect(graph.entity('w').nodes).to.eql(['a', 'b', 'c', 'd']);
});
it("disconnects a way with multiple intersection points", function() {
// Situtation:
// a = b - c