diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
| commit | 33048b6e2738ff73b612dbcb35955189221dfbd0 (patch) | |
| tree | 7e32f6031199c1e7ee9a3e5a15789b5f568a565d /activemodel/test/cases/observing_test.rb | |
| parent | edda0bfe76fc9b2adcdb705665aaef2769e6ef03 (diff) | |
| parent | 9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (diff) | |
| download | rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.gz rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.bz2 rails-33048b6e2738ff73b612dbcb35955189221dfbd0.zip | |
Solving merge conflicts.
Diffstat (limited to 'activemodel/test/cases/observing_test.rb')
| -rw-r--r-- | activemodel/test/cases/observing_test.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/activemodel/test/cases/observing_test.rb b/activemodel/test/cases/observing_test.rb index 564451fa2f..fbf93c19ef 100644 --- a/activemodel/test/cases/observing_test.rb +++ b/activemodel/test/cases/observing_test.rb @@ -1,6 +1,8 @@ require 'cases/helper' -class ObservedModel < ActiveModel::Base +class ObservedModel + include ActiveModel::Observing + class Observer end end @@ -17,7 +19,8 @@ class FooObserver < ActiveModel::Observer end end -class Foo < ActiveModel::Base +class Foo + include ActiveModel::Observing end class ObservingTest < ActiveModel::TestCase |