From 34d75ded5d8053188b31d4c9ae78c9d361e326cf Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Wed, 23 Jun 2010 16:25:13 -0700 Subject: [PATCH] [#4181] Associate a deliverable with a contract on creation. --- app/controllers/deliverables_controller.rb | 3 ++- test/integration/deliverables_new_test.rb | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index 4656082..c8001e0 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -7,7 +7,8 @@ class DeliverablesController < InheritedResources::Base before_filter :authorize def create - @deliverable = FixedDeliverable.new(params[:deliverable]) + @deliverable = begin_of_association_chain.deliverables.build(params[:deliverable]) + @deliverable.type = 'FixedDeliverable' create! { contract_url(@project, @contract) } end diff --git a/test/integration/deliverables_new_test.rb b/test/integration/deliverables_new_test.rb index e89a0aa..c4ad50a 100644 --- a/test/integration/deliverables_new_test.rb +++ b/test/integration/deliverables_new_test.rb @@ -38,6 +38,7 @@ class DeliverablesNewTest < ActionController::IntegrationTest @deliverable = Deliverable.last assert_equal "A New Deliverable", @deliverable.title + assert_equal @contract, @deliverable.contract assert_equal "FixedDeliverable", @deliverable.type assert_equal '2010-01-01', @deliverable.start_date.to_s assert_equal '2010-12-31', @deliverable.end_date.to_s