Merge d8977ef into 8f650d8

activeadmin · Jul 1, 2016 · 57468ef · 57468ef
2 parents 8f650d8 + d8977ef
commit 57468ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/active_admin/filters/humanized.rb b/lib/active_admin/filters/humanized.rb
@@ -43,7 +43,7 @@ def parse_parameter_body
       end
 
       def current_predicate
-        @current_predicate ||= predicates.detect { |p| @body.include?(p) }
+        @current_predicate ||= predicates.detect { |p| @body.end_with?("_#{p}") }
       end
 
       def predicates

diff --git a/spec/unit/filters/humanized_spec.rb b/spec/unit/filters/humanized_spec.rb
@@ -52,5 +52,13 @@
         expect(humanizer.body).to eq("Name Predicate Does Not Exist")
       end
     end
+
+    context 'when column name similar to predicate' do
+      it 'parses correct predicate' do
+        param = ['time_start_gteq', 'test']
+        humanizer = ActiveAdmin::Filters::Humanized.new(param)
+        expect(humanizer.body).to eq('Time Start greater than or equal to')
+      end
+    end
   end
 end