diff options
| author | Xavier Noria <fxn@hashref.com> | 2017-07-02 13:50:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-02 13:50:25 -0700 |
| commit | 92c29d82eb2f323bb1338a039229a66057a7d137 (patch) | |
| tree | 050eea5a719faa416b64b804617f8755b6500e09 /activemodel/test/cases | |
| parent | f851e1f705f26d8f92f0fc1b265b20bc389d23cb (diff) | |
| parent | f443460670576cd82a806a851b7124479e8325c9 (diff) | |
| download | rails-92c29d82eb2f323bb1338a039229a66057a7d137.tar.gz rails-92c29d82eb2f323bb1338a039229a66057a7d137.tar.bz2 rails-92c29d82eb2f323bb1338a039229a66057a7d137.zip | |
Merge branch 'master' into require_relative_2017
Diffstat (limited to 'activemodel/test/cases')
| -rw-r--r-- | activemodel/test/cases/dirty_test.rb | 2 | ||||
| -rw-r--r-- | activemodel/test/cases/type/string_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/test/cases/dirty_test.rb b/activemodel/test/cases/dirty_test.rb index fdd18d7601..0242b96083 100644 --- a/activemodel/test/cases/dirty_test.rb +++ b/activemodel/test/cases/dirty_test.rb @@ -96,7 +96,7 @@ class DirtyTest < ActiveModel::TestCase end test "attribute mutation" do - @model.instance_variable_set("@name", "Yam") + @model.instance_variable_set("@name", "Yam".dup) assert !@model.name_changed? @model.name.replace("Hadad") assert !@model.name_changed? diff --git a/activemodel/test/cases/type/string_test.rb b/activemodel/test/cases/type/string_test.rb index 47d412e27e..5bf9fc3527 100644 --- a/activemodel/test/cases/type/string_test.rb +++ b/activemodel/test/cases/type/string_test.rb @@ -14,7 +14,7 @@ module ActiveModel test "cast strings are mutable" do type = Type::String.new - s = "foo" + s = "foo".dup assert_equal false, type.cast(s).frozen? assert_equal false, s.frozen? |