aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-07 14:15:53 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-07 14:15:53 +0000
commit098fa943565e06dafa67ca59ccf433939d2941b4 (patch)
tree9f660c2aac3e9988d0e1664bac91d884ad2ec3de /activerecord/test
parent9b0fd9d00d8b6e6c3b16bc513b454185fe169454 (diff)
downloadrails-098fa943565e06dafa67ca59ccf433939d2941b4.tar.gz
rails-098fa943565e06dafa67ca59ccf433939d2941b4.tar.bz2
rails-098fa943565e06dafa67ca59ccf433939d2941b4.zip
Fixed documentation snafus #575, #576, #577, #585
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@525 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test')
-rwxr-xr-xactiverecord/test/associations_test.rb38
-rwxr-xr-xactiverecord/test/base_test.rb2
-rwxr-xr-xactiverecord/test/deprecated_associations_test.rb8
3 files changed, 24 insertions, 24 deletions
diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb
index 1133446fa8..63d06de4dd 100755
--- a/activerecord/test/associations_test.rb
+++ b/activerecord/test/associations_test.rb
@@ -705,36 +705,36 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
end
def test_adding_multiple
- aridridel = Developer.new("name" => "Aridridel")
- aridridel.save
- aridridel.projects.reload
- aridridel.projects.push(Project.find(1), Project.find(2))
- assert_equal 2, aridridel.projects.size
- assert_equal 2, aridridel.projects(true).size
+ aredridel = Developer.new("name" => "Aridridel")
+ aredridel.save
+ aredridel.projects.reload
+ aredridel.projects.push(Project.find(1), Project.find(2))
+ assert_equal 2, aredridel.projects.size
+ assert_equal 2, aredridel.projects(true).size
end
def test_adding_a_collection
- aridridel = Developer.new("name" => "Aridridel")
- aridridel.save
- aridridel.projects.reload
- aridridel.projects.concat([Project.find(1), Project.find(2)])
- assert_equal 2, aridridel.projects.size
- assert_equal 2, aridridel.projects(true).size
+ aredridel = Developer.new("name" => "Aridridel")
+ aredridel.save
+ aredridel.projects.reload
+ aredridel.projects.concat([Project.find(1), Project.find(2)])
+ assert_equal 2, aredridel.projects.size
+ assert_equal 2, aredridel.projects(true).size
end
def test_habtm_adding_before_save
no_of_devels = Developer.count
no_of_projects = Project.count
- aridridel = Developer.new("name" => "Aridridel")
- aridridel.projects.concat([Project.find(1), p = Project.new("name" => "Projekt")])
- assert aridridel.new_record?
+ aredridel = Developer.new("name" => "Aridridel")
+ aredridel.projects.concat([Project.find(1), p = Project.new("name" => "Projekt")])
+ assert aredridel.new_record?
assert p.new_record?
- assert aridridel.save
- assert !aridridel.new_record?
+ assert aredridel.save
+ assert !aredridel.new_record?
assert_equal no_of_devels+1, Developer.count
assert_equal no_of_projects+1, Project.count
- assert_equal 2, aridridel.projects.size
- assert_equal 2, aridridel.projects(true).size
+ assert_equal 2, aredridel.projects.size
+ assert_equal 2, aredridel.projects(true).size
end
def test_habtm_adding_before_save_with_join_attributes
diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb
index cbccacdbf5..c1f9a77638 100755
--- a/activerecord/test/base_test.rb
+++ b/activerecord/test/base_test.rb
@@ -575,7 +575,7 @@ class BasicsTest < Test::Unit::TestCase
if Default.connection.class.name == 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
default = Default.new
- # dates / timestampts
+ # dates / timestamps
time_format = "%m/%d/%Y %H:%M"
assert_equal Time.now.strftime(time_format), default.modified_time.strftime(time_format)
assert_equal Date.today, default.modified_date
diff --git a/activerecord/test/deprecated_associations_test.rb b/activerecord/test/deprecated_associations_test.rb
index f746275215..ed1b9be615 100755
--- a/activerecord/test/deprecated_associations_test.rb
+++ b/activerecord/test/deprecated_associations_test.rb
@@ -249,11 +249,11 @@ class DeprecatedAssociationsTest < Test::Unit::TestCase
end
def test_has_and_belongs_to_many_adding_a_collection
- aridridel = Developer.new("name" => "Aridridel")
- aridridel.save
+ aredridel = Developer.new("name" => "Aredridel")
+ aredridel.save
- aridridel.add_projects([ Project.find(1), Project.find(2) ])
- assert_equal 2, aridridel.projects_count
+ aredridel.add_projects([ Project.find(1), Project.find(2) ])
+ assert_equal 2, aredridel.projects_count
end
def test_belongs_to_counter