Merge remote-tracking branch 'upstream/pull/1798'

[rails.git] / test / controllers / trace_controller_test.rb

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)
 
     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_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
     trace = Trace.find(public_trace_file.id)
     assert_equal false, trace.visible
   end