aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/test/models
diff options
context:
space:
mode:
authorJeffrey Guenther <guenther.jeffrey@gmail.com>2017-11-09 09:31:16 -0800
committerJeffrey Guenther <guenther.jeffrey@gmail.com>2017-11-09 09:31:16 -0800
commitd0550ff6717f18961493ab065ff2eebed6199525 (patch)
treef5ff24082dd79e429b7a33e8fe217ffa3bc0b02b /activemodel/test/models
parentd58078d8d65de38d9dca9c629c91e13df291dbb3 (diff)
parent5961d6882bc3a6aaa2b3735e7a8cbe3f2fb901af (diff)
downloadrails-d0550ff6717f18961493ab065ff2eebed6199525.tar.gz
rails-d0550ff6717f18961493ab065ff2eebed6199525.tar.bz2
rails-d0550ff6717f18961493ab065ff2eebed6199525.zip
Merge branch 'master' into activestorage-guide
Diffstat (limited to 'activemodel/test/models')
-rw-r--r--activemodel/test/models/person.rb4
-rw-r--r--activemodel/test/models/topic.rb2
2 files changed, 5 insertions, 1 deletions
diff --git a/activemodel/test/models/person.rb b/activemodel/test/models/person.rb
index b61fdf76b1..8dd8ceadad 100644
--- a/activemodel/test/models/person.rb
+++ b/activemodel/test/models/person.rb
@@ -9,6 +9,10 @@ class Person
def condition_is_true
true
end
+
+ def condition_is_false
+ false
+ end
end
class Person::Gender
diff --git a/activemodel/test/models/topic.rb b/activemodel/test/models/topic.rb
index 2f4e92c3b2..b0af00ee45 100644
--- a/activemodel/test/models/topic.rb
+++ b/activemodel/test/models/topic.rb
@@ -23,7 +23,7 @@ class Topic
true
end
- def condition_is_true_but_its_not
+ def condition_is_false
false
end