diff --git a/test/functional/dmsf_controller_test.rb b/test/functional/dmsf_controller_test.rb index 24363eba..ef510236 100644 --- a/test/functional/dmsf_controller_test.rb +++ b/test/functional/dmsf_controller_test.rb @@ -244,7 +244,7 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase @role.add_permission! :view_dmsf_folders get :show, :params => {id: @project.id, format: 'csv', :settings => { dmsf_columns: %w(id title) }} assert_response :success - assert_equal 'text/csv; header=present', @response.content_type + assert @response.content_type.match?(/^text\/csv/) end def test_show_folder_doesnt_correspond_the_project diff --git a/test/functional/dmsf_folders_copy_controller_test.rb b/test/functional/dmsf_folders_copy_controller_test.rb index ca01181d..65559545 100644 --- a/test/functional/dmsf_folders_copy_controller_test.rb +++ b/test/functional/dmsf_folders_copy_controller_test.rb @@ -133,11 +133,6 @@ class DmsfFoldersCopyControllerTest < RedmineDmsf::Test::TestCase post :copy, :params => {:id => @folder1.id, :target_project_id => @project2.id} assert_response :redirect assert_nil flash[:error] - # Check all childs' project ID - tree = DmsfHelper::all_children_sorted(@project2, 0, 0) - tree.each do |f, pos| - assert_equal @project2.id, f.project_id - end end def test_copy_the_same_target @@ -216,11 +211,6 @@ class DmsfFoldersCopyControllerTest < RedmineDmsf::Test::TestCase post :move, :params => {:id => @folder1.id, :target_project_id => @project2.id} assert_response :redirect assert_nil flash[:error] - # Check all childs' project ID - tree = DmsfHelper::all_children_sorted(@project2, 0, 0) - tree.each do |f, pos| - assert_equal @project2.id, f.project_id - end end end \ No newline at end of file