fixes #2334 - location matcher doesn't match on smart parameters

theforeman · Jun 12, 2013 · c7f5277 · c7f5277
1 parent 8da68b8
commit c7f5277
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/models/taxonomy.rb b/app/models/taxonomy.rb
@@ -32,7 +32,7 @@ def to_param
   end
 
   def to_label
-    name =~ /[A-Z]/ ? name : name.capitalize
+    name
   end
 
   def self.locations_enabled

diff --git a/test/unit/location_test.rb b/test/unit/location_test.rb
@@ -24,7 +24,7 @@ class LocationTest < ActiveSupport::TestCase
 
   test 'it should show the name for to_s' do
     location = Location.new :name => "location name"
-    assert location.to_s == "Location name"
+    assert location.to_s == "location name"
   end
 
   test 'location is invalid without any taxable_taxonomies' do

diff --git a/test/unit/organization_test.rb b/test/unit/organization_test.rb
@@ -24,7 +24,7 @@ class OrganizationTest < ActiveSupport::TestCase
 
   test 'it should show the name for to_s' do
     organization = Organization.new :name => "organization1"
-    assert organization.to_s == "Organization1"
+    assert organization.to_s == "organization1"
   end
 
     test 'organization is invalid without any taxable_taxonomies' do