From 1c86c70c3204933e648274a942a712eba55c8269 Mon Sep 17 00:00:00 2001 From: Dan Wilson Date: Tue, 14 May 2013 18:37:11 +0100 Subject: [PATCH] Use htmlEqual() so that we're more robust against cross-browser serialisation issues. Issue #323. --- test/view.map.test.js | 4 ++-- test/view.slickgrid.test.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/view.map.test.js b/test/view.map.test.js index 8102ec87..598c1a05 100644 --- a/test/view.map.test.js +++ b/test/view.map.test.js @@ -183,7 +183,7 @@ test('Popup', function () { view.remove(); }); -test('Popup - Custom', function () { +test('Popup - Custom', function (assert) { var dataset = GeoJSONFixture.getDataset(); var view = new recline.View.Map({ model: dataset @@ -202,7 +202,7 @@ test('Popup - Custom', function () { assertPresent(popup); var text = popup.html(); - ok((text.indexOf('

1

y: 2') != -1)) + assert.htmlEqual(text, '

1

y: 2'); view.remove(); }); diff --git a/test/view.slickgrid.test.js b/test/view.slickgrid.test.js index de54e9cb..f4686dde 100644 --- a/test/view.slickgrid.test.js +++ b/test/view.slickgrid.test.js @@ -128,7 +128,7 @@ test('update', function() { view.remove(); }); -test('renderers', function () { +test('renderers', function (assert) { var dataset = Fixture.getDataset(); dataset.fields.get('country').renderer = function(val, field, doc){ @@ -150,7 +150,7 @@ test('renderers', function () { view.grid.init(); equal($(view.grid.getCellNode(0,view.grid.getColumnIndex('country'))).text(),'Country: DE'); - equal($(view.grid.getCellNode(0,view.grid.getColumnIndex('country'))).html(),'Country: DE'); + assert.htmlEqual($(view.grid.getCellNode(0,view.grid.getColumnIndex('country'))).html(),'Country: DE'); equal($(view.grid.getCellNode(0,view.grid.getColumnIndex('computed'))).text(),'10'); view.remove(); });