From 964a59310696f7c107e0b6cc21266ea7b41c82ac Mon Sep 17 00:00:00 2001
From: kielni <kimberly@liveworld.com>
Date: Mon, 6 Jan 2014 14:56:31 -0800
Subject: [PATCH] fix variable hiding when finding filter to replace

---
 src/model.js       |  4 ++--
 test/model.test.js | 42 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/model.js b/src/model.js
index 914b72b6..ee6b84b3 100644
--- a/src/model.js
+++ b/src/model.js
@@ -522,8 +522,8 @@ my.Query = Backbone.Model.extend({
     // delete filter on the same field, then add
     var filters = this.get('filters');
     var idx = -1;
-    _.each(this.get('filters'), function(filter, key, list) {
-      if (filter.field == filter.field) {
+    _.each(this.get('filters'), function(f, key, list) {
+      if (filter.field == f.field) {
         idx = key;
       }
     });
diff --git a/test/model.test.js b/test/model.test.js
index e052a391..3103dccd 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -400,22 +400,54 @@ test('Query.addFilter', function () {
 
 test('Query.replaceFilter', function () {
   var query = new recline.Model.Query();
-  query.addFilter({type: 'term', field: 'xyz'});
+  query.addFilter({type: 'term', field: 'xyz', term: 'one'});
   var exp = {
     field: 'xyz',
     type: 'term',
-    term: ''
+    term: 'one'
   };
   deepEqual(query.get('filters')[0], exp);
 
-  query.replaceFilter({type: 'term', field: 'abc'});
+  query.replaceFilter({type: 'term', field: 'xyz', term: 'two'});
   exp = {
-    field: 'abc',
+    field: 'xyz',
     type: 'term',
-    term: ''
+    term: 'two'
   };
   deepEqual(query.get('filters')[0], exp);
 
 });
 
+test('Query.replaceFilter first filter', function () {
+  // replaceFilter changes filter order
+  var query = new recline.Model.Query();
+  query.addFilter({type: 'term', field: 'abc', term: 'one'});
+  query.addFilter({type: 'term', field: 'xyz', term: 'two'});
+  var exp0 = {
+    field: 'abc',
+    type: 'term',
+    term: 'one'
+  };
+  deepEqual(query.get('filters')[0], exp0);
+  var exp1 = {
+    field: 'xyz',
+    type: 'term',
+    term: 'two'
+  };
+  deepEqual(query.get('filters')[1], exp1);
+
+  var numFilters = query.get('filters').length;
+  query.replaceFilter({type: 'term', field: 'abc', term: 'three'});
+  equal(query.get('filters').length, numFilters);
+  exp0 = {
+    field: 'abc',
+    type: 'term',
+    term: 'three'
+  };
+  // deletes original filter and adds replacement to end
+  deepEqual(query.get('filters')[1], exp0);
+  deepEqual(query.get('filters')[0], exp1);
+
+});
+
 })(this.jQuery);