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

Move history annotation to History#perform/replace

Browse Source 
Actions are too low-level for annotations.
This commit is contained in:
John Firebaugh
2012-12-07 10:32:44 -05:00
parent 7eec007740
commit 3e45afbc5e
21 changed files with 142 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/graph/graph.js
-5
View File
@@ -11,11 +11,6 @@ describe('iD.Graph', function() {
expect(graph.entity(entity.id)).to.equal(entity);
});
it('can be constructed with an annotation', function() {
var graph = iD.Graph({}, 'first graph');
expect(graph.annotation).to.equal('first graph');
});
if (iD.debug) {
it("is frozen", function () {
expect(Object.isFrozen(iD.Graph())).to.be.true;
test/spec/graph/history.js
+26 -36
View File
@@ -1,7 +1,6 @@
describe("History", function () {
describe("iD.History", function () {
var history, spy,
graph = iD.Graph([], "action"),
action = function() { return graph; };
action = function() { return iD.Graph(); };
beforeEach(function () {
history = iD.History();
@@ -16,13 +15,14 @@ describe("History", function () {
describe("#perform", function () {
it("updates the graph", function () {
history.perform(action);
var graph = iD.Graph();
history.perform(d3.functor(graph));
expect(history.graph()).to.equal(graph);
});
it("pushes the undo stack", function () {
history.perform(action);
expect(history.undoAnnotation()).to.equal("action");
it("pushes an undo annotation", function () {
history.perform(action, "annotation");
expect(history.undoAnnotation()).to.equal("annotation");
});
it("emits a change event", function () {
@@ -31,32 +31,27 @@ describe("History", function () {
expect(spy).to.have.been.called;
});
it("does not emit a change event when performing a noop", function () {
history.on('change', spy);
history.perform(iD.actions.Noop);
expect(spy).not.to.have.been.called;
});
it("performs multiple actions", function () {
var action1 = sinon.stub().returns(graph),
action2 = sinon.stub().returns(graph);
history.perform(action1, action2);
var action1 = sinon.stub().returns(iD.Graph()),
action2 = sinon.stub().returns(iD.Graph());
history.perform(action1, action2, "annotation");
expect(action1).to.have.been.called;
expect(action2).to.have.been.called;
expect(history.undoAnnotation()).to.equal("annotation");
});
});
describe("#replace", function () {
it("updates the graph", function () {
history.replace(action);
var graph = iD.Graph();
history.replace(d3.functor(graph));
expect(history.graph()).to.equal(graph);
});
it("replaces the undo stack", function () {
history.perform(action);
history.replace(action);
history.undo();
expect(history.undoAnnotation()).to.be.undefined;
it("replaces the undo annotation", function () {
history.perform(action, "annotation1");
history.replace(action, "annotation2");
expect(history.undoAnnotation()).to.equal("annotation2");
});
it("emits a change event", function () {
@@ -65,32 +60,27 @@ describe("History", function () {
expect(spy).to.have.been.called;
});
it("does not emit a change event when performing a noop", function () {
history.on('change', spy);
history.replace(iD.actions.Noop);
expect(spy).not.to.have.been.called;
});
it("performs multiple actions", function () {
var action1 = sinon.stub().returns(graph),
action2 = sinon.stub().returns(graph);
history.replace(action1, action2);
var action1 = sinon.stub().returns(iD.Graph()),
action2 = sinon.stub().returns(iD.Graph());
history.replace(action1, action2, "annotation");
expect(action1).to.have.been.called;
expect(action2).to.have.been.called;
expect(history.undoAnnotation()).to.equal("annotation");
});
});
describe("#undo", function () {
it("pops the undo stack", function () {
history.perform(action);
history.perform(action, "annotation");
history.undo();
expect(history.undoAnnotation()).to.be.undefined;
});
it("pushes the redo stack", function () {
history.perform(action);
history.perform(action, "annotation");
history.undo();
expect(history.redoAnnotation()).to.equal("action");
expect(history.redoAnnotation()).to.equal("annotation");
});
it("emits a change event", function () {
@@ -113,8 +103,8 @@ describe("History", function () {
describe("#reset", function () {
it("clears the version stack", function () {
history.perform(action);
history.perform(action);
history.perform(action, "annotation");
history.perform(action, "annotation");
history.undo();
history.reset();
expect(history.undoAnnotation()).to.be.undefined;