From fa271c54458084bf67e3b0e3b5a6da278d1848f2 Mon Sep 17 00:00:00 2001
From: Max Guglielmi <max.guglielmi@nearmap.com>
Date: Sat, 2 Jul 2016 14:43:07 +1000
Subject: [PATCH] Fixed failing unit test

---
 ...-linked-filters-disabled-options-grid-layout.js | 14 ++++++--------
 test/test-linked-filters-grid-layout.js            |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/test/test-linked-filters-disabled-options-grid-layout.js b/test/test-linked-filters-disabled-options-grid-layout.js
index 3bc2481a..7a019075 100644
--- a/test/test-linked-filters-disabled-options-grid-layout.js
+++ b/test/test-linked-filters-disabled-options-grid-layout.js
@@ -1,7 +1,5 @@
 (function (win, TableFilter) {
 
-    var id = function (id) { return document.getElementById(id); };
-
     var tf = new TableFilter('demo', {
         base_path: '../dist/tablefilter/',
         grid_layout: true,
@@ -12,7 +10,6 @@
     });
 
     tf.init();
-    tf.emitter.on(['after-populating-filter'], checkFilters);
     triggerEvents();
 
     module('Sanity checks');
@@ -22,14 +19,15 @@
     });
 
     function triggerEvents() {
-        var flt0 = id(tf.fltIds[0]);
-        var flt1 = id(tf.fltIds[1]);
+        tf.emitter.on(['after-populating-filter'], checkFilters);
+        var flt0 = tf.getFilterElement(0);
+        var flt1 = tf.getFilterElement(1);
 
         var evObj = document.createEvent('HTMLEvents');
         evObj.initEvent('change', true, true);
 
         var evObj1 = document.createEvent('HTMLEvents');
-        evObj1.initEvent('click', true, true);
+        evObj1.initEvent('click', false, true);
 
         tf.setFilterValue(0, 'Sydney');
         flt0.dispatchEvent(evObj);
@@ -53,10 +51,11 @@
 
     // Tests for https://github.com/koalyptus/TableFilter/pull/42 issue
     function testClearFilters() {
+        tf.emitter.off(['after-populating-filter'], checkFilters);
         test('Check clear filters functionality', function () {
             tf.clearFilters();
 
-            deepEqual(tf.getFilterableRowsNb(), 7,
+            deepEqual(tf.getValidRows().length, 7,
                 'Nb of valid rows after filters are cleared');
 
             tearDown();
@@ -64,7 +63,6 @@
     }
 
     function tearDown() {
-        tf.emitter.off(['after-populating-filter'], checkFilters);
         test('Tear down', function () {
             tf.destroy();
 
diff --git a/test/test-linked-filters-grid-layout.js b/test/test-linked-filters-grid-layout.js
index a1476a7b..a67f53ed 100644
--- a/test/test-linked-filters-grid-layout.js
+++ b/test/test-linked-filters-grid-layout.js
@@ -54,7 +54,7 @@
             tf.clearFilters();
 
             deepEqual(tf.getFilterableRowsNb(), 7,
-                'Nb of valid rows after filters are cleared');
+                'Nb of filterable rows after filters are cleared');
         });
 
         testDestroy();