Merge pull request #1558 from plarus/master

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

diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index 5c71d722fa1518213e9f529b9be65e3df4a8f008..1450aced88275bec8b6e02c90199d81ba7469a43 100644 (file)
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
 require "test_helper"
 

-class NotesControllerTest < ActionController::TestCase
+class NotesControllerTest < ActionDispatch::IntegrationTest

   def setup
     super
     # Stub nominatim response for note locations
   def setup
     super
     # Stub nominatim response for note locations


@@ -13,11 +13,11 @@ class NotesControllerTest < ActionController::TestCase
   def test_routes
     assert_routing(
       { :path => "/user/username/notes", :method => :get },
   def test_routes
     assert_routing(
       { :path => "/user/username/notes", :method => :get },

-      { :controller => "notes", :action => "mine", :display_name => "username" }
+      { :controller => "notes", :action => "index", :display_name => "username" }

     )
   end
 
     )
   end
 

-  def test_mine_success
+  def test_index_success

     first_user = create(:user)
     second_user = create(:user)
     moderator_user = create(:moderator_user)
     first_user = create(:user)
     second_user = create(:user)
     moderator_user = create(:moderator_user)


@@ -33,43 +33,43 @@ class NotesControllerTest < ActionController::TestCase
     end
 
     # Note that the table rows include a header row
     end
 
     # Note that the table rows include a header row

-    get :mine, :params => { :display_name => first_user.display_name }
+    get user_notes_path(:display_name => first_user.display_name)

     assert_response :success
     assert_select "table.note_list tr", :count => 2
 
     assert_response :success
     assert_select "table.note_list tr", :count => 2
 

-    get :mine, :params => { :display_name => second_user.display_name }
+    get user_notes_path(:display_name => second_user.display_name)

     assert_response :success
     assert_select "table.note_list tr", :count => 2
 
     assert_response :success
     assert_select "table.note_list tr", :count => 2
 

-    get :mine, :params => { :display_name => "non-existent" }
+    get user_notes_path(:display_name => "non-existent")

     assert_response :not_found
 
     assert_response :not_found
 

-    session[:user] = moderator_user.id
+    session_for(moderator_user)

 
 

-    get :mine, :params => { :display_name => first_user.display_name }
+    get user_notes_path(:display_name => first_user.display_name)

     assert_response :success
     assert_select "table.note_list tr", :count => 2
 
     assert_response :success
     assert_select "table.note_list tr", :count => 2
 

-    get :mine, :params => { :display_name => second_user.display_name }
+    get user_notes_path(:display_name => second_user.display_name)

     assert_response :success
     assert_select "table.note_list tr", :count => 3
 
     assert_response :success
     assert_select "table.note_list tr", :count => 3
 

-    get :mine, :params => { :display_name => "non-existent" }
+    get user_notes_path(:display_name => "non-existent")

     assert_response :not_found
   end
 
     assert_response :not_found
   end
 

-  def test_mine_paged
+  def test_index_paged

     user = create(:user)
 
     create_list(:note, 50) do |note|
       create(:note_comment, :note => note, :author => user)
     end
 
     user = create(:user)
 
     create_list(:note, 50) do |note|
       create(:note_comment, :note => note, :author => user)
     end
 

-    get :mine, :params => { :display_name => user.display_name }
+    get user_notes_path(:display_name => user.display_name)

     assert_response :success
     assert_select "table.note_list tr", :count => 11
 
     assert_response :success
     assert_select "table.note_list tr", :count => 11
 

-    get :mine, :params => { :display_name => user.display_name, :page => 2 }
+    get user_notes_path(:display_name => user.display_name, :page => 2)

     assert_response :success
     assert_select "table.note_list tr", :count => 11
   end
     assert_response :success
     assert_select "table.note_list tr", :count => 11
   end