`type_cast_from_user` -> `cast`

3 files changed, 28 insertions, 28 deletions

diff --git a/activerecord/test/cases/type/decimal_test.rb b/activerecord/test/cases/type/decimal_test.rb
index 34ed1d7b19..fe49d0e79a 100644
--- a/activerecord/test/cases/type/decimal_test.rb
+++ b/activerecord/test/cases/type/decimal_test.rb
@@ -5,29 +5,29 @@ module ActiveRecord
     class DecimalTest < ActiveRecord::TestCase
       def test_type_cast_decimal
         type = Decimal.new
-        assert_equal BigDecimal.new("0"), type.type_cast_from_user(BigDecimal.new("0"))
-        assert_equal BigDecimal.new("123"), type.type_cast_from_user(123.0)
-        assert_equal BigDecimal.new("1"), type.type_cast_from_user(:"1")
+        assert_equal BigDecimal.new("0"), type.cast(BigDecimal.new("0"))
+        assert_equal BigDecimal.new("123"), type.cast(123.0)
+        assert_equal BigDecimal.new("1"), type.cast(:"1")
       end
 
       def test_type_cast_decimal_from_float_with_large_precision
         type = Decimal.new(precision: ::Float::DIG + 2)
-        assert_equal BigDecimal.new("123.0"), type.type_cast_from_user(123.0)
+        assert_equal BigDecimal.new("123.0"), type.cast(123.0)
       end
 
       def test_type_cast_from_float_with_unspecified_precision
         type = Decimal.new
-        assert_equal 22.68.to_d, type.type_cast_from_user(22.68)
+        assert_equal 22.68.to_d, type.cast(22.68)
       end
 
       def test_type_cast_decimal_from_rational_with_precision
         type = Decimal.new(precision: 2)
-        assert_equal BigDecimal("0.33"), type.type_cast_from_user(Rational(1, 3))
+        assert_equal BigDecimal("0.33"), type.cast(Rational(1, 3))
       end
 
       def test_type_cast_decimal_from_rational_without_precision_defaults_to_18_36
         type = Decimal.new
-        assert_equal BigDecimal("0.333333333333333333E0"), type.type_cast_from_user(Rational(1, 3))
+        assert_equal BigDecimal("0.333333333333333333E0"), type.cast(Rational(1, 3))
       end
 
       def test_type_cast_decimal_from_object_responding_to_d
@@ -36,7 +36,7 @@ module ActiveRecord
           BigDecimal.new("1")
         end
         type = Decimal.new
-        assert_equal BigDecimal("1"), type.type_cast_from_user(value)
+        assert_equal BigDecimal("1"), type.cast(value)
       end
 
       def test_changed?
diff --git a/activerecord/test/cases/type/integer_test.rb b/activerecord/test/cases/type/integer_test.rb
index a767c73cf2..84fb05dd8e 100644
--- a/activerecord/test/cases/type/integer_test.rb
+++ b/activerecord/test/cases/type/integer_test.rb
@@ -6,39 +6,39 @@ module ActiveRecord
     class IntegerTest < ActiveRecord::TestCase
       test "simple values" do
         type = Type::Integer.new
-        assert_equal 1, type.type_cast_from_user(1)
-        assert_equal 1, type.type_cast_from_user('1')
-        assert_equal 1, type.type_cast_from_user('1ignore')
-        assert_equal 0, type.type_cast_from_user('bad1')
-        assert_equal 0, type.type_cast_from_user('bad')
-        assert_equal 1, type.type_cast_from_user(1.7)
-        assert_equal 0, type.type_cast_from_user(false)
-        assert_equal 1, type.type_cast_from_user(true)
-        assert_nil type.type_cast_from_user(nil)
+        assert_equal 1, type.cast(1)
+        assert_equal 1, type.cast('1')
+        assert_equal 1, type.cast('1ignore')
+        assert_equal 0, type.cast('bad1')
+        assert_equal 0, type.cast('bad')
+        assert_equal 1, type.cast(1.7)
+        assert_equal 0, type.cast(false)
+        assert_equal 1, type.cast(true)
+        assert_nil type.cast(nil)
       end
 
       test "random objects cast to nil" do
         type = Type::Integer.new
-        assert_nil type.type_cast_from_user([1,2])
-        assert_nil type.type_cast_from_user({1 => 2})
-        assert_nil type.type_cast_from_user((1..2))
+        assert_nil type.cast([1,2])
+        assert_nil type.cast({1 => 2})
+        assert_nil type.cast((1..2))
       end
 
       test "casting ActiveRecord models" do
         type = Type::Integer.new
         firm = Firm.create(:name => 'Apple')
-        assert_nil type.type_cast_from_user(firm)
+        assert_nil type.cast(firm)
       end
 
       test "casting objects without to_i" do
         type = Type::Integer.new
-        assert_nil type.type_cast_from_user(::Object.new)
+        assert_nil type.cast(::Object.new)
       end
 
       test "casting nan and infinity" do
         type = Type::Integer.new
-        assert_nil type.type_cast_from_user(::Float::NAN)
-        assert_nil type.type_cast_from_user(1.0/0.0)
+        assert_nil type.cast(::Float::NAN)
+        assert_nil type.cast(1.0/0.0)
       end
 
       test "casting booleans for database" do
diff --git a/activerecord/test/cases/type/string_test.rb b/activerecord/test/cases/type/string_test.rb
index 880b6e8541..56e9bf434d 100644
--- a/activerecord/test/cases/type/string_test.rb
+++ b/activerecord/test/cases/type/string_test.rb
@@ -4,15 +4,15 @@ module ActiveRecord
   class StringTypeTest < ActiveRecord::TestCase
     test "type casting" do
       type = Type::String.new
-      assert_equal "t", type.type_cast_from_user(true)
-      assert_equal "f", type.type_cast_from_user(false)
-      assert_equal "123", type.type_cast_from_user(123)
+      assert_equal "t", type.cast(true)
+      assert_equal "f", type.cast(false)
+      assert_equal "123", type.cast(123)
     end
 
     test "values are duped coming out" do
       s = "foo"
       type = Type::String.new
-      assert_not_same s, type.type_cast_from_user(s)
+      assert_not_same s, type.cast(s)
       assert_not_same s, type.deserialize(s)
     end