Fix tests due to core changes

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

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')
 

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