Redmine 4.1.1

test/functional/journals_controller_test.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Redmine - project management software
-# Copyright (C) 2006-2017  Jean-Philippe Lang
+# Copyright (C) 2006-2019  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -60,6 +62,7 @@ class JournalsControllerTest < Redmine::ControllerTest
   end
 
   def test_index_should_show_visible_custom_fields_only
+    set_tmp_attachments_directory
     Issue.destroy_all
     Journal.delete_all
     field_attributes = {:field_format => 'string', :is_for_all => true, :is_filter => true, :trackers => Tracker.all}
@@ -178,11 +181,13 @@ class JournalsControllerTest < Redmine::ControllerTest
     @request.session[:user_id] = 2
     get :new, :params => {
         :id => 6,
-        :journal_id => 4
+        :journal_id => 4,
+        :journal_indice => 1
       },
       :xhr => true
     assert_response :success
     assert_equal 'text/javascript', response.content_type
+    assert_include 'Redmine Admin wrote in #note-1:', response.body
     assert_include '> A comment with a private version', response.body
   end
 
@@ -253,6 +258,8 @@ class JournalsControllerTest < Redmine::ControllerTest
     assert_equal 'text/javascript', response.content_type
     assert_equal 'Updated notes', Journal.find(2).notes
     assert_include 'journal-2-notes', response.body
+    # response should include journal_indice param for quote link
+    assert_include 'journal_indice=2', response.body
   end
 
   def test_update_xhr_with_private_notes_checked
@@ -272,7 +279,7 @@ class JournalsControllerTest < Redmine::ControllerTest
   end
 
   def test_update_xhr_with_private_notes_unchecked
-    Journal.find(2).update_attributes(:private_notes => true)
+    Journal.find(2).update(:private_notes => true)
     @request.session[:user_id] = 1
     post :update, :params => {
         :id => 2,