From fbd38b3678072dcaaf23ad78f0eec16bc2ca7419 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Mon, 8 Aug 2011 10:32:04 -0700 Subject: [PATCH] Fix tests due to core changes --- app/helpers/contracts_helper.rb | 9 ++++----- .../helper_issues_show_detail_after_setting_hook_test.rb | 6 +++--- .../hooks/view_issues_show_details_bottom_hook_test.rb | 3 +++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/helpers/contracts_helper.rb b/app/helpers/contracts_helper.rb index b50249e..4e49e50 100644 --- a/app/helpers/contracts_helper.rb +++ b/app/helpers/contracts_helper.rb @@ -1,10 +1,9 @@ module ContractsHelper def setup_nested_deliverable_records(deliverable) - returning(deliverable) do |d| - d.labor_budgets.build if d.labor_budgets.empty? - d.overhead_budgets.build if d.overhead_budgets.empty? - d.fixed_budgets.build if d.fixed_budgets.empty? - end + deliverable.labor_budgets.build if deliverable.labor_budgets.empty? + deliverable.overhead_budgets.build if deliverable.overhead_budgets.empty? + deliverable.fixed_budgets.build if deliverable.fixed_budgets.empty? + deliverable end # Simple helper to show the values of a field on an object in a standard format diff --git a/test/integration/redmine_contracts/hooks/helper_issues_show_detail_after_setting_hook_test.rb b/test/integration/redmine_contracts/hooks/helper_issues_show_detail_after_setting_hook_test.rb index 9debdf2..c96dad8 100644 --- a/test/integration/redmine_contracts/hooks/helper_issues_show_detail_after_setting_hook_test.rb +++ b/test/integration/redmine_contracts/hooks/helper_issues_show_detail_after_setting_hook_test.rb @@ -19,15 +19,15 @@ class RedmineContracts::Hooks::HelperIssuesShowDetailAfterSettingHookTest < Acti # Set first @issue.init_journal(@manager) @issue.deliverable = @deliverable1 - @issue.save! + @issue.save! && @issue.reload # Change @issue.init_journal(@manager) @issue.deliverable = @deliverable2 - @issue.save! + @issue.save! && @issue.reload # Unset @issue.init_journal(@manager) @issue.deliverable = nil - @issue.save! + @issue.save! && @issue.reload login_as('manager', 'existing') diff --git a/test/unit/lib/redmine_contracts/hooks/view_issues_show_details_bottom_hook_test.rb b/test/unit/lib/redmine_contracts/hooks/view_issues_show_details_bottom_hook_test.rb index 0e42dfb..845cccb 100644 --- a/test/unit/lib/redmine_contracts/hooks/view_issues_show_details_bottom_hook_test.rb +++ b/test/unit/lib/redmine_contracts/hooks/view_issues_show_details_bottom_hook_test.rb @@ -19,6 +19,9 @@ class RedmineContracts::Hooks::ViewIssuesShowDetailsBottomTest < ActionControlle @controller ||= ApplicationController.new @controller.class.send(:include, ::Redmine::I18n) @controller.response ||= ActionController::TestResponse.new + def @controller.api_request? + false + end # Hack to support render_on @controller.instance_variable_set('@template', template) @controller.response = response