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

Rename permitted -> enabled and add to more actions

Browse Source
This commit is contained in:
John Firebaugh
2013-01-23 15:05:00 -05:00
parent 671e138fcd
commit 72618574f3
7 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/actions/split_way.js
+4 -4
View File
@@ -1,5 +1,5 @@
describe("iD.actions.SplitWay", function () {
describe("#permitted", function () {
describe("#enabled", function () {
it("returns true for a non-end node of a single way", function () {
var graph = iD.Graph({
'a': iD.Node({id: 'a'}),
@@ -8,7 +8,7 @@ describe("iD.actions.SplitWay", function () {
'-': iD.Way({id: '-', nodes: ['a', 'b', 'c']})
});
expect(iD.actions.SplitWay('b').permitted(graph)).to.be.true;
expect(iD.actions.SplitWay('b').enabled(graph)).to.be.true;
});
it("returns false for the first node of a single way", function () {
@@ -18,7 +18,7 @@ describe("iD.actions.SplitWay", function () {
'-': iD.Way({id: '-', nodes: ['a', 'b']})
});
expect(iD.actions.SplitWay('a').permitted(graph)).to.be.false;
expect(iD.actions.SplitWay('a').enabled(graph)).to.be.false;
});
it("returns false for the last node of a single way", function () {
@@ -28,7 +28,7 @@ describe("iD.actions.SplitWay", function () {
'-': iD.Way({id: '-', nodes: ['a', 'b']})
});
expect(iD.actions.SplitWay('b').permitted(graph)).to.be.false;
expect(iD.actions.SplitWay('b').enabled(graph)).to.be.false;
});
});
test/spec/actions/unjoin_node.js
+3 -3
View File
@@ -1,9 +1,9 @@
describe("iD.actions.UnjoinNode", function () {
describe("#permitted", function () {
describe("#enabled", function () {
it("returns false for a node shared by less than two ways", function () {
var graph = iD.Graph({'a': iD.Node()});
expect(iD.actions.UnjoinNode('a').permitted(graph)).to.equal(false);
expect(iD.actions.UnjoinNode('a').enabled(graph)).to.equal(false);
});
it("returns true for a node shared by two or more ways", function () {
@@ -19,7 +19,7 @@ describe("iD.actions.UnjoinNode", function () {
'|': iD.Way({id: '|', nodes: ['d', 'b']})
});
expect(iD.actions.UnjoinNode('b').permitted(graph)).to.equal(true);
expect(iD.actions.UnjoinNode('b').enabled(graph)).to.equal(true);
});
});