Merge branch 'master' into bug/filtered_parameters_class

2 files changed, 11 insertions, 3 deletions

diff --git a/activemodel/test/cases/type/string_test.rb b/activemodel/test/cases/type/string_test.rb
index 222083817e..47d412e27e 100644
--- a/activemodel/test/cases/type/string_test.rb
+++ b/activemodel/test/cases/type/string_test.rb
@@ -12,16 +12,25 @@ module ActiveModel
       end
 
       test "cast strings are mutable" do
-        s = "foo"
         type = Type::String.new
+
+        s = "foo"
         assert_equal false, type.cast(s).frozen?
+        assert_equal false, s.frozen?
+
+        f = "foo".freeze
+        assert_equal false, type.cast(f).frozen?
+        assert_equal true, f.frozen?
       end
 
       test "values are duped coming out" do
-        s = "foo"
         type = Type::String.new
+
+        s = "foo"
         assert_not_same s, type.cast(s)
+        assert_equal s, type.cast(s)
         assert_not_same s, type.deserialize(s)
+        assert_equal s, type.deserialize(s)
       end
     end
   end
diff --git a/activemodel/test/validators/email_validator.rb b/activemodel/test/validators/email_validator.rb
index 9b74d83b37..f733c45cf0 100644
--- a/activemodel/test/validators/email_validator.rb
+++ b/activemodel/test/validators/email_validator.rb
@@ -1,4 +1,3 @@
-
 class EmailValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     record.errors[attribute] << (options[:message] || "is not an email") unless