Merged r3398 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3465 e93f8b46-1217-0410-a6f0-8f06a7374b81

config/environments/test.rb

@@ -25,5 +25,5 @@ config.action_controller.session = {
 config.action_controller.allow_forgery_protection  = false
 
 config.gem "thoughtbot-shoulda", :lib => "shoulda", :source => "http://gems.github.com"
-config.gem "nofxx-object_daddy", :lib => "object_daddy", :source => "http://gems.github.com"
+config.gem "edavis10-object_daddy", :lib => "object_daddy"
 config.gem "mocha"

test/exemplars/issue_exemplar.rb

@@ -1,6 +1,7 @@
 class Issue < ActiveRecord::Base
   generator_for :subject, :method => :next_subject
   generator_for :author, :method => :next_author
+  generator_for :priority, :method => :fetch_priority
   
   def self.next_subject
     @last_subject ||= 'Subject 0'
@@ -12,4 +13,8 @@ class Issue < ActiveRecord::Base
     User.generate_with_protected!
   end
 
+  def self.fetch_priority
+    IssuePriority.first || IssuePriority.generate!
+  end
+
 end

test/object_daddy_helpers.rb

@@ -1,30 +1,16 @@
 module ObjectDaddyHelpers
-  # TODO: The gem or official version of ObjectDaddy doesn't set
+  # TODO: Remove these three once everyone has ported their code to use the
-  # protected attributes so they need to be wrapped.
+  # new object_daddy version with protected attribute support
   def User.generate_with_protected(attributes={})
-    user = User.spawn_with_protected(attributes)
+    User.generate(attributes)
-    user.save
-    user
   end
 
-  # TODO: The gem or official version of ObjectDaddy doesn't set
-  # protected attributes so they need to be wrapped.
   def User.generate_with_protected!(attributes={})
-    user = User.spawn_with_protected(attributes)
+    User.generate!(attributes)
-    user.save!
-    user
   end
 
-  # TODO: The gem or official version of ObjectDaddy doesn't set
-  # protected attributes so they need to be wrapped.
   def User.spawn_with_protected(attributes={})
-    user = User.spawn(attributes) do |user|
+    User.spawn(attributes)
-      user.login = User.next_login
-      attributes.each do |attr,v|
-        user.send("#{attr}=", v)
-      end
-    end
-    user
   end
 
   # Generate the default Query

test/unit/project_test.rb

@@ -597,7 +597,7 @@ class ProjectTest < ActiveSupport::TestCase
     end
 
     should "copy issues" do
-      @source_project.issues << Issue.generate!(:status_id => 5,
+      @source_project.issues << Issue.generate!(:status => IssueStatus.find_by_name('Closed'),
                                                 :subject => "copy issue status",
                                                 :tracker_id => 1,
                                                 :assigned_to_id => 2,