jro_apps/redmine Commit - r3284:81ee2ff884c8

Updated object_daddy to a newer version (bugfixes)...

Eric Davis -

r3284:81ee2ff884c8

parent child

Context file:

r3284:81ee2ff884c8

config/environments/test.rb +1 -1

             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 +5 0

             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'
                 User.generate_with_protected!
               end
+              def self.fetch_priority
+                IssuePriority.first || IssuePriority.generate!
+              end
             end

test/object_daddy_helpers.rb +5 -19

@@ -1,30 +1,16
1	module ObjectDaddyHelpers	1	module ObjectDaddyHelpers
2	# TODO: The gem or official version of ObjectDaddy doesn't set	2	# TODO: Remove these three once everyone has ported their code to use the
3	# protected attributes so they need to be wrapped.	3	# new object_daddy version with protected attribute support
4	def User.generate_with_protected(attributes={})	4	def User.generate_with_protected(attributes={})
5	~~user~~ = User.~~spawn_with_protected~~(attributes)	5	User.generate(attributes)
6	user.save
7	user
8	end	6	end
9		7
10	# TODO: The gem or official version of ObjectDaddy doesn't set
11	# protected attributes so they need to be wrapped.
12	def User.generate_with_protected!(attributes={})	8	def User.generate_with_protected!(attributes={})
13	~~user~~ = User.~~spawn_with_protected~~(attributes)	9	User.generate!(attributes)
14	user.save!
15	user
16	end	10	end
17		11
18	# TODO: The gem or official version of ObjectDaddy doesn't set
19	# protected attributes so they need to be wrapped.
20	def User.spawn_with_protected(attributes={})	12	def User.spawn_with_protected(attributes={})
21	~~user~~ = User.spawn(attributes) do \|~~user~~\|	13	User.spawn(attributes)
22	user.login = User.next_login
23	attributes.each do \|attr,v\|
24	user.send("#{attr}=", v)
25	end
26	end
27	user
28	end	14	end
29		15
30	# Generate the default Query	16	# Generate the default Query

test/unit/project_test.rb +1 -1

                 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,

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages