1 files changed, 63 insertions, 9 deletions
diff --git a/activerecord/test/cases/integration_test.rb b/activerecord/test/cases/integration_test.rb
index 406aacb056..dfb8a608cb 100644
--- a/activerecord/test/cases/integration_test.rb
+++ b/activerecord/test/cases/integration_test.rb
@@ -1,11 +1,13 @@
+# encoding: utf-8
+
 require 'cases/helper'
 require 'models/company'
 require 'models/developer'
-require 'models/car'
-require 'models/bulb'
+require 'models/owner'
+require 'models/pet'
 
 class IntegrationTest < ActiveRecord::TestCase
-  fixtures :companies, :developers
+  fixtures :companies, :developers, :owners, :pets
 
   def test_to_param_should_return_string
     assert_kind_of String, Client.first.to_param
@@ -22,6 +24,52 @@ class IntegrationTest < ActiveRecord::TestCase
     assert_equal '1', client.to_param
   end
 
+  def test_to_param_class_method
+    firm = Firm.find(4)
+    assert_equal '4-flamboyant-software', firm.to_param
+  end
+
+  def test_to_param_class_method_truncates
+    firm = Firm.find(4)
+    firm.name = 'a ' * 100
+    assert_equal '4-a-a-a-a-a-a-a-a-a', firm.to_param
+  end
+
+  def test_to_param_class_method_truncates_edge_case
+    firm = Firm.find(4)
+    firm.name = 'David HeinemeierHansson'
+    assert_equal '4-david', firm.to_param
+  end
+
+  def test_to_param_class_method_squishes
+    firm = Firm.find(4)
+    firm.name = "ab \n" * 100
+    assert_equal '4-ab-ab-ab-ab-ab-ab', firm.to_param
+  end
+
+  def test_to_param_class_method_multibyte_character
+    firm = Firm.find(4)
+    firm.name = "戦場ヶ原 ひたぎ"
+    assert_equal '4', firm.to_param
+  end
+
+  def test_to_param_class_method_uses_default_if_blank
+    firm = Firm.find(4)
+    firm.name = nil
+    assert_equal '4', firm.to_param
+    firm.name = ' '
+    assert_equal '4', firm.to_param
+  end
+
+  def test_to_param_class_method_uses_default_if_not_persisted
+    firm = Firm.new(name: 'Fancy Shirts')
+    assert_equal nil, firm.to_param
+  end
+
+  def test_to_param_with_no_arguments
+    assert_equal 'Firm', Firm.to_param
+  end
+
   def test_cache_key_for_existing_record_is_not_timezone_dependent
     utc_key = Developer.first.cache_key
 
@@ -42,13 +90,14 @@ class IntegrationTest < ActiveRecord::TestCase
   end
 
   def test_cache_key_changes_when_child_touched
-    car = Car.create
-    Bulb.create(car: car)
+    owner = owners(:blackbeard)
+    pet   = pets(:parrot)
+
+    owner.update_column :updated_at, Time.current
+    key = owner.cache_key
 
-    key = car.cache_key
-    car.bulb.touch
-    car.reload
-    assert_not_equal key, car.cache_key
+    assert pet.touch
+    assert_not_equal key, owner.reload.cache_key
   end
 
   def test_cache_key_format_for_existing_record_with_nil_updated_timestamps
@@ -81,4 +130,9 @@ class IntegrationTest < ActiveRecord::TestCase
     dev.touch
     assert_not_equal key, dev.cache_key
   end
+
+  def test_named_timestamps_for_cache_key
+    owner = owners(:blackbeard)
+    assert_equal "owners/#{owner.id}-#{owner.happy_at.utc.to_s(:nsec)}", owner.cache_key(:updated_at, :happy_at)
+  end
 end