aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource/test
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-09-23 22:35:08 +0200
committerXavier Noria <fxn@hashref.com>2010-09-23 22:35:08 +0200
commit8c0c815ba711c439cbc4d295c423d5d6ab0bb848 (patch)
tree46ebc98a50a631a8962cb48505f75454cd8f24f1 /activeresource/test
parentafdf86e8ee7c64915515e7ad8930efd858fceb43 (diff)
parent5965219ca2230dc46cff2feace19d83b7493f440 (diff)
downloadrails-8c0c815ba711c439cbc4d295c423d5d6ab0bb848.tar.gz
rails-8c0c815ba711c439cbc4d295c423d5d6ab0bb848.tar.bz2
rails-8c0c815ba711c439cbc4d295c423d5d6ab0bb848.zip
resolves rdoc conflict
Diffstat (limited to 'activeresource/test')
-rw-r--r--activeresource/test/cases/base/schema_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activeresource/test/cases/base/schema_test.rb b/activeresource/test/cases/base/schema_test.rb
index be9807e5c8..37f30e4353 100644
--- a/activeresource/test/cases/base/schema_test.rb
+++ b/activeresource/test/cases/base/schema_test.rb
@@ -386,7 +386,7 @@ class SchemaTest < ActiveModel::TestCase
assert_not_equal matz.known_attributes, rick.known_attributes, "should have had different known attributes too"
end
- test "setting schema then fetching should add schema attributes to the intance attributes" do
+ test "setting schema then fetching should add schema attributes to the instance attributes" do
# an attribute in common with fetched instance and one that isn't
new_schema = {'age' => 'integer', 'name' => 'string',
'height' => 'float', 'bio' => 'text',