X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/11cc4a5e601dd288d601e6e35a72d159062f18b5..0e2a66e8de55b3719bd307261058b7f898598994:/test/controllers/changesets_controller_test.rb?ds=inline diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb index caf7721cd..a5ce2aa62 100644 --- a/test/controllers/changesets_controller_test.rb +++ b/test/controllers/changesets_controller_test.rb @@ -1,6 +1,6 @@ require "test_helper" -class ChangesetsControllerTest < ActionController::TestCase +class ChangesetsControllerTest < ActionDispatch::IntegrationTest ## # test all routes which lead to this controller def test_routes @@ -33,49 +33,63 @@ class ChangesetsControllerTest < ActionController::TestCase ## # This should display the last 20 changesets closed def test_index - get :index, :params => { :format => "html" } + changesets = create_list(:changeset, 30, :num_changes => 1) + + get history_path(:format => "html") 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" - check_index_result(Changeset.all) + check_index_result(changesets.last(20)) end ## # This should display the last 20 changesets closed def test_index_xhr - get :index, :params => { :format => "html" }, :xhr => true + changesets = create_list(:changeset, 30, :num_changes => 1) + + get history_path(:format => "html"), :xhr => true 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" - check_index_result(Changeset.all) + check_index_result(changesets.last(20)) end ## # 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" } + changesets = create_list(:changeset, 10, :num_changes => 1, :min_lat => 50000000, :max_lat => 50000001, :min_lon => 50000000, :max_lon => 50000001) + other_changesets = create_list(:changeset, 10, :num_changes => 1, :min_lat => 0, :max_lat => 1, :min_lon => 0, :max_lon => 1) + + # First check they all show up without a bbox parameter + get history_path(:format => "html", :list => "1"), :xhr => true + assert_response :success + assert_template "index" + check_index_result(changesets + other_changesets) + + # Then check with bbox parameter + 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 - 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" - check_index_result(Changeset.where("min_lon < 55000000 and max_lon > 45000000 and min_lat < 55000000 and max_lat > 45000000")) + check_index_result(changesets) end ## @@ -85,11 +99,11 @@ class ChangesetsControllerTest < ActionController::TestCase 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" - 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" @@ -103,25 +117,25 @@ class ChangesetsControllerTest < ActionController::TestCase 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" - 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" - check_index_result(Changeset.none) + check_index_result([]) end ## # 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" - 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 @@ -131,23 +145,24 @@ class ChangesetsControllerTest < ActionController::TestCase def test_index_friends private_user = create(:user, :data_public => true) friendship = create(:friendship, :befriender => private_user) - create(:changeset, :user => friendship.befriendee) + changeset = create(:changeset, :user => friendship.befriendee, :num_changes => 1) + _changeset2 = create(:changeset, :user => create(:user), :num_changes => 1) - get :index, :params => { :friends => true } + get 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" - get :index, :params => { :friends => true, :list => "1" }, :xhr => true + get friend_changesets_path(:list => "1"), :xhr => true assert_response :success assert_template "index" - check_index_result(Changeset.where(:user => private_user.friends.identifiable)) + check_index_result([changeset]) end ## @@ -155,39 +170,44 @@ class ChangesetsControllerTest < ActionController::TestCase def test_index_nearby private_user = create(:user, :data_public => false, :home_lat => 51.1, :home_lon => 1.0) user = create(:user, :home_lat => 51.0, :home_lon => 1.0) - create(:changeset, :user => user) + far_away_user = create(:user, :home_lat => 51.0, :home_lon => 130) + changeset = create(:changeset, :user => user, :num_changes => 1) + _changeset2 = create(:changeset, :user => far_away_user, :num_changes => 1) - get :index, :params => { :nearby => true } + get 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" - get :index, :params => { :nearby => true, :list => "1" }, :xhr => true + get nearby_changesets_path(:list => "1"), :xhr => true assert_response :success assert_template "index" - check_index_result(Changeset.where(:user => user.nearby)) + check_index_result([changeset]) end ## # 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 + changeset = create(:changeset, :num_changes => 1) + _changeset2 = create(:changeset, :num_changes => 1) + + get history_path(:format => "html", :max_id => changeset.id), :xhr => true 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 => changeset.id), :xhr => true assert_response :success assert_template "index" - check_index_result(Changeset.where("id <= 4")) + check_index_result([changeset]) end ## @@ -195,10 +215,10 @@ class ChangesetsControllerTest < ActionController::TestCase def test_index_more create_list(:changeset, 50) - get :index, :params => { :format => "html" } + get history_path(:format => "html") assert_response :success - get :index, :params => { :format => "html" }, :xhr => true + get history_path(:format => "html"), :xhr => true assert_response :success end @@ -211,10 +231,10 @@ class ChangesetsControllerTest < ActionController::TestCase 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.content_type + assert_equal "application/atom+xml", response.media_type check_feed_result([changeset, closed_changeset]) end @@ -229,10 +249,10 @@ 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) - 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.content_type + assert_equal "application/atom+xml", response.media_type check_feed_result([changeset, closed_changeset]) end @@ -246,11 +266,11 @@ class ChangesetsControllerTest < ActionController::TestCase 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_equal "application/atom+xml", response.content_type + assert_equal "application/atom+xml", response.media_type check_feed_result(changesets) end @@ -258,14 +278,14 @@ class ChangesetsControllerTest < ActionController::TestCase ## # 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 - 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 @@ -275,11 +295,6 @@ class ChangesetsControllerTest < ActionController::TestCase ## # check the result of a index def check_index_result(changesets) - changesets = changesets.where("num_changes > 0") - .order(:created_at => :desc) - .limit(20) - assert changesets.size <= 20 - assert_select "ol.changesets", :count => [changesets.size, 1].min do assert_select "li", :count => changesets.size