Merge pull request #240 from ryanfox1985/development

Refactor.
leikind · Jul 16, 2015 · ca64889 · ca64889
2 parents f5ec0fe + 2d7739c
commit ca64889
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/wice/grid_output_buffer.rb b/lib/wice/grid_output_buffer.rb
@@ -25,9 +25,11 @@ def filter_for(detach_with_id)
           fail WiceGridException.new("No filter with Detached ID '#{detach_with_id}'!")
         end
       end
-      if @filters[detach_with_id] == false
+
+      unless @filters[detach_with_id]
         fail WiceGridException.new("Filter with Detached ID '#{detach_with_id}' has already been requested once! There cannot be two instances of the same filter on one page")
       end
+
       res = @filters[detach_with_id]
       @filters[detach_with_id] = false
       res

diff --git a/spec/wice/lib/grid_output_buffer_spec.rb b/spec/wice/lib/grid_output_buffer_spec.rb
@@ -34,5 +34,12 @@ module Wice
 
       expect { grid.filter_for('key') }.to raise_error
     end
+
+    it 'should filter_for return empty string' do
+      grid = GridOutputBuffer.new
+      grid.return_empty_strings_for_nonexistent_filters = true
+
+      expect(grid.filter_for('key')).to eq('')
+    end
   end
 end