diff test/unit/project_test.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/test/unit/project_test.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/test/unit/project_test.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -133,8 +133,7 @@
   end
 
   def test_identifier_should_not_be_frozen_for_a_saved_project_with_blank_identifier
-    Project.update_all(["identifier = ''"], "id = 1")
-
+    Project.where(:id => 1).update_all(["identifier = ''"])
     assert_equal false, Project.find(1).identifier_frozen?
   end
 
@@ -203,7 +202,7 @@
     # 2 active members
     assert_equal 2, @ecookbook.members.size
     # and 1 is locked
-    assert_equal 3, Member.where('project_id = ?', @ecookbook.id).all.size
+    assert_equal 3, Member.where(:project_id => @ecookbook.id).count
     # some boards
     assert @ecookbook.boards.any?
 
@@ -225,7 +224,7 @@
     assert_nothing_raised do
       Project.find(1).destroy
     end
-    assert Issue.find_all_by_id(issues.map(&:id)).empty?
+    assert_equal 0, Issue.where(:id => issues.map(&:id)).count
   end
 
   def test_destroying_root_projects_should_clear_data
@@ -258,11 +257,20 @@
     assert_equal 0, WikiPage.count
     assert_equal 0, WikiContent.count
     assert_equal 0, WikiContent::Version.count
-    assert_equal 0, Project.connection.select_all("SELECT * FROM projects_trackers").size
-    assert_equal 0, Project.connection.select_all("SELECT * FROM custom_fields_projects").size
+    assert_equal 0, Project.connection.select_all("SELECT * FROM projects_trackers").count
+    assert_equal 0, Project.connection.select_all("SELECT * FROM custom_fields_projects").count
     assert_equal 0, CustomValue.where(:customized_type => ['Project', 'Issue', 'TimeEntry', 'Version']).count
   end
 
+  def test_destroy_should_delete_time_entries_custom_values
+    project = Project.generate!
+    time_entry = TimeEntry.generate!(:project => project, :custom_field_values => {10 => '1'})
+
+    assert_difference 'CustomValue.where(:customized_type => "TimeEntry").count', -1 do
+      assert project.destroy
+    end
+  end
+
   def test_move_an_orphan_project_to_a_root_project
     sub = Project.find(2)
     sub.set_parent! @ecookbook
@@ -576,7 +584,7 @@
     assert_equal [1,2,3], parent.version_ids.sort
     assert_equal [4], child.version_ids
     assert_equal [6], private_child.version_ids
-    assert_equal [7], Version.find_all_by_sharing('system').collect(&:id)
+    assert_equal [7], Version.where(:sharing => 'system').collect(&:id)
 
     assert_equal 6, parent.shared_versions.size
     parent.shared_versions.each do |version|
@@ -722,6 +730,7 @@
   def test_activities_should_use_the_system_activities
     project = Project.find(1)
     assert_equal project.activities, TimeEntryActivity.where(:active => true).all
+    assert_kind_of ActiveRecord::Relation, project.activities
   end
 
 
@@ -731,6 +740,7 @@
     assert overridden_activity.save!
 
     assert project.activities.include?(overridden_activity), "Project specific Activity not found"
+    assert_kind_of ActiveRecord::Relation, project.activities
   end
 
   def test_activities_should_not_include_the_inactive_project_specific_activities