Refactor some more controller tests

diff --git a/test/controllers/changeset_comments_controller_test.rb b/test/controllers/changeset_comments_controller_test.rb
index a1a00c5dc7d70f09314cbe2998668a9fc71d17c4..b18698744439afb561c9ebf76af028817099378e 100644 (file)
--- a/test/controllers/changeset_comments_controller_test.rb
+++ b/test/controllers/changeset_comments_controller_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
 require "test_helper"
 

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

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -20,7 +20,7 @@ class ChangesetCommentsControllerTest < ActionController::TestCase
     changeset = create(:changeset, :closed)
     create_list(:changeset_comment, 3, :changeset => changeset)
 
     changeset = create(:changeset, :closed)
     create_list(:changeset_comment, 3, :changeset => changeset)
 

-    get :index, :params => { :format => "rss" }
+    get changesets_comments_feed_path(:format => "rss")

     assert_response :success
     assert_equal "application/rss+xml", @response.media_type
     assert_select "rss", :count => 1 do
     assert_response :success
     assert_equal "application/rss+xml", @response.media_type
     assert_select "rss", :count => 1 do


@@ -29,7 +29,7 @@ class ChangesetCommentsControllerTest < ActionController::TestCase
       end
     end
 
       end
     end
 

-    get :index, :params => { :format => "rss", :limit => 2 }
+    get changesets_comments_feed_path(:format => "rss", :limit => 2)

     assert_response :success
     assert_equal "application/rss+xml", @response.media_type
     assert_select "rss", :count => 1 do
     assert_response :success
     assert_equal "application/rss+xml", @response.media_type
     assert_select "rss", :count => 1 do


@@ -38,7 +38,7 @@ class ChangesetCommentsControllerTest < ActionController::TestCase
       end
     end
 
       end
     end
 

-    get :index, :params => { :id => changeset.id, :format => "rss" }
+    get changeset_comments_feed_path(:id => changeset.id, :format => "rss")

     assert_response :success
     assert_equal "application/rss+xml", @response.media_type
     assert_select "rss", :count => 1 do
     assert_response :success
     assert_equal "application/rss+xml", @response.media_type
     assert_select "rss", :count => 1 do


@@ -51,10 +51,10 @@ class ChangesetCommentsControllerTest < ActionController::TestCase
   ##
   # test comments feed
   def test_feed_bad_limit
   ##
   # test comments feed
   def test_feed_bad_limit

-    get :index, :params => { :format => "rss", :limit => 0 }
+    get changesets_comments_feed_path(:format => "rss", :limit => 0)

     assert_response :bad_request
 
     assert_response :bad_request
 

-    get :index, :params => { :format => "rss", :limit => 100001 }
+    get changesets_comments_feed_path(:format => "rss", :limit => 100001)

     assert_response :bad_request
   end
 end
     assert_response :bad_request
   end
 end

diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb
index e754e32b71dac1ed67829c099b98596cf0f61c3f..d1fc5c65c5c2868af867235a2e1c97490db87283 100644 (file)
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
 require "test_helper"
 

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

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -33,13 +33,13 @@ class ChangesetsControllerTest < ActionController::TestCase
   ##
   # This should display the last 20 changesets closed
   def test_index
   ##
   # This should display the last 20 changesets closed
   def test_index

-    get :index, :params => { :format => "html" }
+    get history_path(:format => "html")

     assert_response :success
     assert_template "history"
     assert_template :layout => "map"
     assert_select "h2", :text => "Changesets", :count => 1
 
     assert_response :success
     assert_template "history"
     assert_template :layout => "map"
     assert_select "h2", :text => "Changesets", :count => 1
 

-    get :index, :params => { :format => "html", :list => "1" }, :xhr => true
+    get history_path(:format => "html", :list => "1"), :xhr => true

     assert_response :success
     assert_template "index"
 
     assert_response :success
     assert_template "index"
 


@@ -49,13 +49,13 @@ class ChangesetsControllerTest < ActionController::TestCase
   ##
   # This should display the last 20 changesets closed
   def test_index_xhr
   ##
   # This should display the last 20 changesets closed
   def test_index_xhr

-    get :index, :params => { :format => "html" }, :xhr => true
+    get history_path(:format => "html"), :xhr => true

     assert_response :success
     assert_template "history"
     assert_template :layout => "xhr"
     assert_select "h2", :text => "Changesets", :count => 1
 
     assert_response :success
     assert_template "history"
     assert_template :layout => "xhr"
     assert_select "h2", :text => "Changesets", :count => 1
 

-    get :index, :params => { :format => "html", :list => "1" }, :xhr => true
+    get history_path(:format => "html", :list => "1"), :xhr => true

     assert_response :success
     assert_template "index"
 
     assert_response :success
     assert_template "index"
 


@@ -65,13 +65,13 @@ class ChangesetsControllerTest < ActionController::TestCase
   ##
   # This should display the last 20 changesets closed in a specific area
   def test_index_bbox
   ##
   # This should display the last 20 changesets closed in a specific area
   def test_index_bbox

-    get :index, :params => { :format => "html", :bbox => "4.5,4.5,5.5,5.5" }
+    get history_path(:format => "html", :bbox => "4.5,4.5,5.5,5.5")

     assert_response :success
     assert_template "history"
     assert_template :layout => "map"
     assert_select "h2", :text => "Changesets", :count => 1
 
     assert_response :success
     assert_template "history"
     assert_template :layout => "map"
     assert_select "h2", :text => "Changesets", :count => 1
 

-    get :index, :params => { :format => "html", :bbox => "4.5,4.5,5.5,5.5", :list => "1" }, :xhr => true
+    get history_path(:format => "html", :bbox => "4.5,4.5,5.5,5.5", :list => "1"), :xhr => true

     assert_response :success
     assert_template "index"
 
     assert_response :success
     assert_template "index"
 


@@ -85,11 +85,11 @@ class ChangesetsControllerTest < ActionController::TestCase
     create(:changeset, :user => user)
     create(:changeset, :closed, :user => user)
 
     create(:changeset, :user => user)
     create(:changeset, :closed, :user => user)
 

-    get :index, :params => { :format => "html", :display_name => user.display_name }
+    get history_path(:format => "html", :display_name => user.display_name)

     assert_response :success
     assert_template "history"
 
     assert_response :success
     assert_template "history"
 

-    get :index, :params => { :format => "html", :display_name => user.display_name, :list => "1" }, :xhr => true
+    get history_path(:format => "html", :display_name => user.display_name, :list => "1"), :xhr => true

     assert_response :success
     assert_template "index"
 
     assert_response :success
     assert_template "index"
 


@@ -103,11 +103,11 @@ class ChangesetsControllerTest < ActionController::TestCase
     create(:changeset, :user => private_user)
     create(:changeset, :closed, :user => private_user)
 
     create(:changeset, :user => private_user)
     create(:changeset, :closed, :user => private_user)
 

-    get :index, :params => { :format => "html", :display_name => private_user.display_name }
+    get history_path(:format => "html", :display_name => private_user.display_name)

     assert_response :success
     assert_template "history"
 
     assert_response :success
     assert_template "history"
 

-    get :index, :params => { :format => "html", :display_name => private_user.display_name, :list => "1" }, :xhr => true
+    get history_path(:format => "html", :display_name => private_user.display_name, :list => "1"), :xhr => true

     assert_response :success
     assert_template "index"
 
     assert_response :success
     assert_template "index"
 


@@ -117,11 +117,11 @@ class ChangesetsControllerTest < ActionController::TestCase
   ##
   # Check the not found of the index user changesets
   def test_index_user_not_found
   ##
   # Check the not found of the index user changesets
   def test_index_user_not_found

-    get :index, :params => { :format => "html", :display_name => "Some random user" }
+    get history_path(:format => "html", :display_name => "Some random user")

     assert_response :not_found
     assert_template "users/no_such_user"
 
     assert_response :not_found
     assert_template "users/no_such_user"
 

-    get :index, :params => { :format => "html", :display_name => "Some random user", :list => "1" }, :xhr => true
+    get history_path(:format => "html", :display_name => "Some random user", :list => "1"), :xhr => true

     assert_response :not_found
     assert_template "users/no_such_user"
   end
     assert_response :not_found
     assert_template "users/no_such_user"
   end


@@ -133,17 +133,17 @@ class ChangesetsControllerTest < ActionController::TestCase
     friendship = create(:friendship, :befriender => private_user)
     create(:changeset, :user => friendship.befriendee)
 
     friendship = create(:friendship, :befriender => private_user)
     create(:changeset, :user => friendship.befriendee)
 

-    get :index, :params => { :friends => true }
+    get friend_changesets_path

     assert_response :redirect
     assert_redirected_to :controller => :users, :action => :login, :referer => friend_changesets_path
 
     assert_response :redirect
     assert_redirected_to :controller => :users, :action => :login, :referer => friend_changesets_path
 

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

 
 

-    get :index, :params => { :friends => true }
+    get friend_changesets_path

     assert_response :success
     assert_template "history"
 
     assert_response :success
     assert_template "history"
 

-    get :index, :params => { :friends => true, :list => "1" }, :xhr => true
+    get friend_changesets_path(:list => "1"), :xhr => true

     assert_response :success
     assert_template "index"
 
     assert_response :success
     assert_template "index"
 


@@ -157,17 +157,17 @@ class ChangesetsControllerTest < ActionController::TestCase
     user = create(:user, :home_lat => 51.0, :home_lon => 1.0)
     create(:changeset, :user => user)
 
     user = create(:user, :home_lat => 51.0, :home_lon => 1.0)
     create(:changeset, :user => user)
 

-    get :index, :params => { :nearby => true }
+    get nearby_changesets_path

     assert_response :redirect
     assert_redirected_to :controller => :users, :action => :login, :referer => nearby_changesets_path
 
     assert_response :redirect
     assert_redirected_to :controller => :users, :action => :login, :referer => nearby_changesets_path
 

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

 
 

-    get :index, :params => { :nearby => true }
+    get nearby_changesets_path

     assert_response :success
     assert_template "history"
 
     assert_response :success
     assert_template "history"
 

-    get :index, :params => { :nearby => true, :list => "1" }, :xhr => true
+    get nearby_changesets_path(:list => "1"), :xhr => true

     assert_response :success
     assert_template "index"
 
     assert_response :success
     assert_template "index"
 


@@ -177,13 +177,13 @@ class ChangesetsControllerTest < ActionController::TestCase
   ##
   # Check that we can't request later pages of the changesets index
   def test_index_max_id
   ##
   # Check that we can't request later pages of the changesets index
   def test_index_max_id

-    get :index, :params => { :format => "html", :max_id => 4 }, :xhr => true
+    get history_path(:format => "html", :max_id => 4), :xhr => true

     assert_response :success
     assert_template "history"
     assert_template :layout => "xhr"
     assert_select "h2", :text => "Changesets", :count => 1
 
     assert_response :success
     assert_template "history"
     assert_template :layout => "xhr"
     assert_select "h2", :text => "Changesets", :count => 1
 

-    get :index, :params => { :format => "html", :list => "1", :max_id => 4 }, :xhr => true
+    get history_path(:format => "html", :list => "1", :max_id => 4), :xhr => true

     assert_response :success
     assert_template "index"
 
     assert_response :success
     assert_template "index"
 


@@ -195,10 +195,10 @@ class ChangesetsControllerTest < ActionController::TestCase
   def test_index_more
     create_list(:changeset, 50)
 
   def test_index_more
     create_list(:changeset, 50)
 

-    get :index, :params => { :format => "html" }
+    get history_path(:format => "html")

     assert_response :success
 
     assert_response :success
 

-    get :index, :params => { :format => "html" }, :xhr => true
+    get history_path(:format => "html"), :xhr => true

     assert_response :success
   end
 
     assert_response :success
   end
 


@@ -211,7 +211,7 @@ class ChangesetsControllerTest < ActionController::TestCase
     closed_changeset = create(:changeset, :closed, :num_changes => 1)
     _empty_changeset = create(:changeset, :num_changes => 0)
 
     closed_changeset = create(:changeset, :closed, :num_changes => 1)
     _empty_changeset = create(:changeset, :num_changes => 0)
 

-    get :feed, :params => { :format => :atom }
+    get history_feed_path(:format => :atom)

     assert_response :success
     assert_template "index"
     assert_equal "application/atom+xml", response.media_type
     assert_response :success
     assert_template "index"
     assert_equal "application/atom+xml", response.media_type


@@ -229,7 +229,7 @@ class ChangesetsControllerTest < ActionController::TestCase
     _elsewhere_changeset = create(:changeset, :num_changes => 1, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
     _empty_changeset = create(:changeset, :num_changes => 0, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
 
     _elsewhere_changeset = create(:changeset, :num_changes => 1, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
     _empty_changeset = create(:changeset, :num_changes => 0, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
 

-    get :feed, :params => { :format => :atom, :bbox => "4.5,4.5,5.5,5.5" }
+    get history_feed_path(:format => :atom, :bbox => "4.5,4.5,5.5,5.5")

     assert_response :success
     assert_template "index"
     assert_equal "application/atom+xml", response.media_type
     assert_response :success
     assert_template "index"
     assert_equal "application/atom+xml", response.media_type


@@ -246,7 +246,7 @@ class ChangesetsControllerTest < ActionController::TestCase
     create(:changeset_tag, :changeset => changesets[1], :k => "website", :v => "http://example.com/")
     _other_changeset = create(:changeset)
 
     create(:changeset_tag, :changeset => changesets[1], :k => "website", :v => "http://example.com/")
     _other_changeset = create(:changeset)
 

-    get :feed, :params => { :format => :atom, :display_name => user.display_name }
+    get history_feed_path(:format => :atom, :display_name => user.display_name)

 
     assert_response :success
     assert_template "index"
 
     assert_response :success
     assert_template "index"


@@ -258,14 +258,14 @@ class ChangesetsControllerTest < ActionController::TestCase
   ##
   # Check the not found of the user changesets feed
   def test_feed_user_not_found
   ##
   # Check the not found of the user changesets feed
   def test_feed_user_not_found

-    get :feed, :params => { :format => "atom", :display_name => "Some random user" }
+    get history_feed_path(:format => "atom", :display_name => "Some random user")

     assert_response :not_found
   end
 
   ##
   # Check that we can't request later pages of the changesets feed
   def test_feed_max_id
     assert_response :not_found
   end
 
   ##
   # Check that we can't request later pages of the changesets feed
   def test_feed_max_id

-    get :feed, :params => { :format => "atom", :max_id => 100 }
+    get history_feed_path(:format => "atom", :max_id => 100)

     assert_response :redirect
     assert_redirected_to :action => :feed
   end
     assert_response :redirect
     assert_redirected_to :action => :feed
   end

diff --git a/test/controllers/directions_controller_test.rb b/test/controllers/directions_controller_test.rb
index 1335ea469bb6549a7eeef80217445b4ad30dd351..31f57b9db334703231f4a0f2083da71409682467 100644 (file)
--- a/test/controllers/directions_controller_test.rb
+++ b/test/controllers/directions_controller_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
 require "test_helper"
 

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

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -13,7 +13,7 @@ class DirectionsControllerTest < ActionController::TestCase
   ###
   # test the search action
   def test_search
   ###
   # test the search action
   def test_search

-    get :search
+    get directions_path

     assert_response :success
   end
 end
     assert_response :success
   end
 end

diff --git a/test/controllers/errors_controller_test.rb b/test/controllers/errors_controller_test.rb
index 01b07efc89a998eaf5ddd2cf69e2e8fd75182d2f..9f8ccee56d66acc34b147625b643af81698df178 100644 (file)
--- a/test/controllers/errors_controller_test.rb
+++ b/test/controllers/errors_controller_test.rb
@@ -1,6 +1,6 @@
 require "test_helper"
 
 require "test_helper"
 

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

   def test_routes
     assert_routing(
       { :path => "/403", :method => :get },
   def test_routes
     assert_routing(
       { :path => "/403", :method => :get },


@@ -17,17 +17,17 @@ class ErrorsControllerTest < ActionController::TestCase
   end
 
   def test_forbidden
   end
 
   def test_forbidden

-    get :forbidden
+    get "/403"

     assert_response :forbidden
   end
 
   def test_not_found
     assert_response :forbidden
   end
 
   def test_not_found

-    get :not_found
+    get "/404"

     assert_response :not_found
   end
 
   def test_internal_server_error
     assert_response :not_found
   end
 
   def test_internal_server_error

-    get :internal_server_error
+    get "/500"

     assert_response :internal_server_error
   end
 end
     assert_response :internal_server_error
   end
 end