Fix tests

This commit is contained in:
John Firebaugh
2013-05-28 11:52:05 -07:00
parent e913d564d9
commit d088b39d34
2 changed files with 17 additions and 24 deletions
+2 -2
View File
@@ -64,7 +64,7 @@ describe("iD.behavior.Hover", function() {
it("replaces the .hover class with .hover-suppressed", function () {
container.append('span').attr('class', 'hover');
container.call(iD.behavior.Hover().altDisables(true));
container.call(iD.behavior.Hover(context).altDisables(true));
happen.keydown(document, {keyCode: 18});
expect(container.selectAll('.hover')[0]).to.have.length(0);
@@ -76,7 +76,7 @@ describe("iD.behavior.Hover", function() {
it("replaces the .hover-suppressed class with .hover", function () {
container.append('span').attr('class', 'hover-suppressed');
container.call(iD.behavior.Hover().altDisables(true));
container.call(iD.behavior.Hover(context).altDisables(true));
happen.keyup(document, {keyCode: 18});
expect(container.selectAll('.hover')[0]).to.have.length(1);
+15 -22
View File
@@ -1,38 +1,29 @@
describe('iD.ui.RawTagEditor', function() {
var taglist, element,
tags = {highway: 'residential'},
entity, context;
function render() {
taglist = iD.ui.RawTagEditor(context, entity);
function render(tags) {
taglist = iD.ui.RawTagEditor(context)
.entityID(entity.id)
.preset({isFallback: function() { return false; }})
.tags(tags);
element = d3.select('body')
.append('div')
.call(taglist);
taglist.tags(entity.tags);
}
beforeEach(function () {
entity = iD.Entity({type: 'node', id: "n12345", tags: tags});
entity = iD.Node({id: "n12345"});
context = iD();
render();
context.history().merge({n12345: entity});
render({highway: 'residential'});
});
afterEach(function () {
element.remove();
});
describe("#tags", function () {
it("returns the current tags", function () {
expect(taglist.tags()).to.eql(tags);
});
it("returns updated tags when input values have changed", function () {
element.selectAll("input.key").property('value', 'k');
element.selectAll("input.value").property('value', 'v');
expect(taglist.tags()).to.eql({k: 'v'});
});
});
it("creates input elements for each key-value pair", function () {
expect(element.selectAll("input[value=highway]")).not.to.be.empty;
expect(element.selectAll("input[value=residential]")).not.to.be.empty;
@@ -40,8 +31,7 @@ describe('iD.ui.RawTagEditor', function() {
it("creates a pair of empty input elements if the entity has no tags", function () {
element.remove();
entity = entity.update({tags: {}});
render();
render({});
expect(element.select('.tag-list').selectAll("input.value").property('value')).to.be.empty;
expect(element.select('.tag-list').selectAll("input.key").property('value')).to.be.empty;
});
@@ -52,9 +42,12 @@ describe('iD.ui.RawTagEditor', function() {
expect(element.select('.tag-list').selectAll("input")[0][3].value).to.be.empty;
});
it("removes tags when clicking the remove button", function () {
it("removes tags when clicking the remove button", function (done) {
taglist.on('change', function(tags) {
expect(tags).to.eql({highway: undefined});
done();
});
element.selectAll("button.remove").trigger('click');
expect(taglist.tags()).to.eql({});
});
it("adds tags when pressing the TAB key on last input.value", function () {