diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-11-12 15:02:12 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-11-12 15:02:12 +0000 |
| commit | 55b6697493e2fc39f3e2a7b6b3c8bcfb94947daa (patch) | |
| tree | 6161ad38218dd66da8431d0914a896751e74a005 /actionpack/test/fixtures | |
| parent | a406643b959d4bb601c62857ca38ebcd91eec4a8 (diff) | |
| download | rails-55b6697493e2fc39f3e2a7b6b3c8bcfb94947daa.tar.gz rails-55b6697493e2fc39f3e2a7b6b3c8bcfb94947daa.tar.bz2 rails-55b6697493e2fc39f3e2a7b6b3c8bcfb94947daa.zip | |
Fixed that has_many :through associations should render as collections too (closes #9051) [mathie/danger]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8130 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/fixtures')
| -rw-r--r-- | actionpack/test/fixtures/db_definitions/sqlite.sql | 3 | ||||
| -rw-r--r-- | actionpack/test/fixtures/developer.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/fixtures/replies.yml | 2 | ||||
| -rw-r--r-- | actionpack/test/fixtures/reply.rb | 3 |
4 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/test/fixtures/db_definitions/sqlite.sql b/actionpack/test/fixtures/db_definitions/sqlite.sql index b4e7539d16..358c2bbb04 100644 --- a/actionpack/test/fixtures/db_definitions/sqlite.sql +++ b/actionpack/test/fixtures/db_definitions/sqlite.sql @@ -9,7 +9,8 @@ CREATE TABLE 'replies' ( 'content' text, 'created_at' datetime, 'updated_at' datetime, - 'topic_id' integer + 'topic_id' integer, + 'developer_id' integer ); CREATE TABLE 'topics' ( diff --git a/actionpack/test/fixtures/developer.rb b/actionpack/test/fixtures/developer.rb index f5e5b901fd..c70eda34c6 100644 --- a/actionpack/test/fixtures/developer.rb +++ b/actionpack/test/fixtures/developer.rb @@ -1,5 +1,7 @@ class Developer < ActiveRecord::Base has_and_belongs_to_many :projects + has_many :replies + has_many :topics, :through => :replies end class DeVeLoPeR < ActiveRecord::Base diff --git a/actionpack/test/fixtures/replies.yml b/actionpack/test/fixtures/replies.yml index 284c9c0796..a17d2fc42b 100644 --- a/actionpack/test/fixtures/replies.yml +++ b/actionpack/test/fixtures/replies.yml @@ -1,6 +1,7 @@ witty_retort: id: 1 topic_id: 1 + developer_id: 1 content: Birdman is better! created_at: <%= 6.hours.ago.to_s(:db) %> updated_at: nil @@ -8,6 +9,7 @@ witty_retort: another: id: 2 topic_id: 2 + developer_id: 1 content: Nuh uh! created_at: <%= 1.hour.ago.to_s(:db) %> updated_at: nil
\ No newline at end of file diff --git a/actionpack/test/fixtures/reply.rb b/actionpack/test/fixtures/reply.rb index ea84042b9a..588713de1e 100644 --- a/actionpack/test/fixtures/reply.rb +++ b/actionpack/test/fixtures/reply.rb @@ -1,5 +1,6 @@ class Reply < ActiveRecord::Base belongs_to :topic, :include => [:replies] - + belongs_to :developer + validates_presence_of :content end |