Change test case

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 81c7864738cf3d5208a1566f23c7a2a86becd9fd..5dd49c6be704edf8400663be9712d574308aa01d 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -192,7 +192,11 @@ class TraceController < ApplicationController
       trace.visible = false
       trace.save
       flash[:notice] = t "trace.delete.scheduled_for_deletion"
-      redirect_to :action => :list, :display_name => current_user.display_name
+      if current_user.administrator? || current_user.moderator?
+        redirect_to :action => :list, :display_name => trace.user.display_name
+      else
+        redirect_to :action => :list, :display_name => current_user.display_name
+      end
     end
   rescue ActiveRecord::RecordNotFound
     head :not_found

diff --git a/test/controllers/trace_controller_test.rb b/test/controllers/trace_controller_test.rb
index a9008bc972886fefc3474ee5ab73225879654414..23a2e5261755063f705fab8bcaf103afc26bcd11 100644 (file)
--- a/test/controllers/trace_controller_test.rb
+++ b/test/controllers/trace_controller_test.rb
@@ -690,9 +690,9 @@ class TraceControllerTest < ActionController::TestCase
     public_trace_file = create(:trace, :visibility => "public")
     admin = create(:administrator_user)
 
-    post :delete, :params => { :display_name => admin.display_name, :id => public_trace_file.id }, :session => { :user => admin }
+    post :delete, :params => { :display_name => public_trace_file.user.display_name, :id => public_trace_file.id }, :session => { :user => admin }
     assert_response :redirect
-    assert_redirected_to :action => :list, :display_name => admin.display_name
+    assert_redirected_to :action => :list, :display_name => public_trace_file.user.display_name
     trace = Trace.find(public_trace_file.id)
     assert_equal false, trace.visible
   end