diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-09-08 15:38:51 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-09-08 15:38:51 -0300 |
| commit | 670281c6b2e9b9e8c51a140f2a5f66b251f1b84b (patch) | |
| tree | ab141872d72e010c8a0fe371d22a00914c97e1eb /activeresource/test/cases/observing_test.rb | |
| parent | 39e4e76d15233bb1cb0b778d920f54efe86bb4f0 (diff) | |
| parent | 1a0f822037c408a392ffa7b6e1ecbe5951ab48db (diff) | |
| download | rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.tar.gz rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.tar.bz2 rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'activeresource/test/cases/observing_test.rb')
| -rw-r--r-- | activeresource/test/cases/observing_test.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activeresource/test/cases/observing_test.rb b/activeresource/test/cases/observing_test.rb index 334b256772..9599ff7b0f 100644 --- a/activeresource/test/cases/observing_test.rb +++ b/activeresource/test/cases/observing_test.rb @@ -1,4 +1,6 @@ require 'abstract_unit' +require 'fixtures/person' +require 'active_support/core_ext/hash/conversions' class ObservingTest < Test::Unit::TestCase cattr_accessor :history |