aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-05-02 15:54:07 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-05-02 20:59:22 -0300
commitdbacebafac45db1369396a5702f5435b863d3278 (patch)
tree7b9d17bcfc05c8c3814261bf38695ac75559c966 /activerecord/test
parentc1c6f514f482f8880beb8bf6e7471a201ce8af30 (diff)
downloadrails-dbacebafac45db1369396a5702f5435b863d3278.tar.gz
rails-dbacebafac45db1369396a5702f5435b863d3278.tar.bz2
rails-dbacebafac45db1369396a5702f5435b863d3278.zip
Move dup destroyed test to specific file that tests dup logic
Also change other related test to use existing record rather than creating new one.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/dup_test.rb8
-rw-r--r--activerecord/test/cases/persistence_test.rb11
2 files changed, 10 insertions, 9 deletions
diff --git a/activerecord/test/cases/dup_test.rb b/activerecord/test/cases/dup_test.rb
index 1e6ccecfab..b22e8dc153 100644
--- a/activerecord/test/cases/dup_test.rb
+++ b/activerecord/test/cases/dup_test.rb
@@ -32,6 +32,14 @@ module ActiveRecord
assert duped.new_record?, 'topic is new'
end
+ def test_dup_not_destroyed
+ topic = Topic.first
+ topic.destroy
+
+ duped = topic.dup
+ assert_not duped.destroyed?
+ end
+
def test_dup_has_no_id
topic = Topic.first
duped = topic.dup
diff --git a/activerecord/test/cases/persistence_test.rb b/activerecord/test/cases/persistence_test.rb
index 9209672ac5..823146b399 100644
--- a/activerecord/test/cases/persistence_test.rb
+++ b/activerecord/test/cases/persistence_test.rb
@@ -234,19 +234,12 @@ class PersistenceTest < ActiveRecord::TestCase
end
def test_save_with_duping_of_destroyed_object
- developer = Developer.create(name: "Kuldeep")
+ developer = Developer.first
developer.destroy
new_developer = developer.dup
new_developer.save
assert new_developer.persisted?
- end
-
- def test_dup_of_destroyed_object_is_not_destroyed
- developer = Developer.create(name: "Kuldeep")
- developer.destroy
- new_developer = developer.dup
- new_developer.save
- assert_equal new_developer.destroyed?, false
+ assert_not new_developer.destroyed?
end
def test_create_many