1 files changed, 24 insertions, 14 deletions
diff --git a/activerecord/test/readonly_test.rb b/activerecord/test/readonly_test.rb
index cbab35b49a..458cd6886f 100755
--- a/activerecord/test/readonly_test.rb
+++ b/activerecord/test/readonly_test.rb
@@ -1,31 +1,41 @@
 require 'abstract_unit'
-require 'fixtures/topic'
+require 'fixtures/developer'
+require 'fixtures/project'
 
 class ReadOnlyTest < Test::Unit::TestCase
-  fixtures :topics
+  fixtures :developers, :projects, :developers_projects
 
   def test_cant_save_readonly_record
-    topic = Topic.find(:first)
-    assert !topic.readonly?
+    dev = Developer.find(:first)
+    assert !dev.readonly?
 
-    topic.readonly!
-    assert topic.readonly?
+    dev.readonly!
+    assert dev.readonly?
 
     assert_nothing_raised do
-      topic.content = 'Luscious forbidden fruit.'
+      dev.name = 'Luscious forbidden fruit.'
+      assert !dev.save
+      dev.name = 'Forbidden.'
     end
-
-    assert_raise(ActiveRecord::ReadOnlyRecord)  { topic.save  }
-    assert_raise(ActiveRecord::ReadOnlyRecord)  { topic.save! }
+    assert_raise(ActiveRecord::ReadOnlyRecord) { dev.save  }
+    assert_raise(ActiveRecord::ReadOnlyRecord) { dev.save! }
   end
 
   def test_find_with_readonly_option
-    Topic.find(:all).each { |t| assert !t.readonly? }
-    Topic.find(:all, :readonly => false).each { |t| assert !t.readonly? }
-    Topic.find(:all, :readonly => true).each { |t| assert t.readonly? }
+    Developer.find(:all).each { |d| assert !d.readonly? }
+    Developer.find(:all, :readonly => false).each { |d| assert !d.readonly? }
+    Developer.find(:all, :readonly => true).each { |d| assert d.readonly? }
   end
 
   def test_find_with_joins_option_implies_readonly
-    Topic.find(:all, :joins => '').each { |t| assert t.readonly? }
+    Developer.find(:all, :joins => '').each { |d| assert d.readonly? }
+    Developer.find(:all, :joins => '', :readonly => false).each { |d| assert !d.readonly? }
+  end
+
+  def test_habtm_find_readonly
+    dev = Developer.find(:first)
+    dev.projects.each { |p| assert !p.readonly? }
+    dev.projects.find(:all) { |p| assert !p.readonly? }
+    dev.projects.find(:all, :readonly => true) { |p| assert p.readonly? }
   end
 end