diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-10-06 12:11:38 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-10-06 12:11:38 +0100 |
| commit | c954d54e2f36bb53ced5e3655adc071dd233797e (patch) | |
| tree | d84bf4bf51f65a1c817089c6fe37c3e9f20420d0 /actionpack/test/controller/record_identifier_test.rb | |
| parent | f2b41914d6be935182d37e0c0d491352ac3de043 (diff) | |
| parent | d40ca9cce241a8083756c993d6c99a79e62e050e (diff) | |
| download | rails-c954d54e2f36bb53ced5e3655adc071dd233797e.tar.gz rails-c954d54e2f36bb53ced5e3655adc071dd233797e.tar.bz2 rails-c954d54e2f36bb53ced5e3655adc071dd233797e.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'actionpack/test/controller/record_identifier_test.rb')
| -rw-r--r-- | actionpack/test/controller/record_identifier_test.rb | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/actionpack/test/controller/record_identifier_test.rb b/actionpack/test/controller/record_identifier_test.rb index 835a0e970b..f3e5ff8a47 100644 --- a/actionpack/test/controller/record_identifier_test.rb +++ b/actionpack/test/controller/record_identifier_test.rb @@ -1,30 +1,5 @@ require 'abstract_unit' - -class Comment - extend ActiveModel::Naming - include ActiveModel::Conversion - - attr_reader :id - def to_key; id ? [id] : nil end - def save; @id = 1 end - def new_record?; @id.nil? end - def name - @id.nil? ? 'new comment' : "comment ##{@id}" - end -end - -class Sheep - extend ActiveModel::Naming - include ActiveModel::Conversion - - attr_reader :id - def to_key; id ? [id] : nil end - def save; @id = 1 end - def new_record?; @id.nil? end - def name - @id.nil? ? 'new sheep' : "sheep ##{@id}" - end -end +require 'controller/fake_models' class RecordIdentifierTest < Test::Unit::TestCase include ActionController::RecordIdentifier |