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

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

diff --git a/test/controllers/changesets_controller_test.rb b/test/controllers/changesets_controller_test.rb
index d1fc5c65c5c2868af867235a2e1c97490db87283..31a1e2d0c77b43d35d263491aabadd8899bc7443 100644 (file)
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -33,49 +33,72 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
   ##
   # This should display the last 20 changesets closed
   def test_index
+    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
+    assert_select "link[rel='alternate'][type='application/atom+xml']", :count => 1 do
+      assert_select "[href=?]", "http://www.example.com/history/feed"
+    end
 
     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
+    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
+    assert_select "link[rel='alternate'][type='application/atom+xml']", :count => 1 do
+      assert_select "[href=?]", "http://www.example.com/history/feed"
+    end
 
     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
+    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
+    assert_select "link[rel='alternate'][type='application/atom+xml']", :count => 1 do
+      assert_select "[href=?]", "http://www.example.com/history/feed?bbox=4.5%2C4.5%2C5.5%2C5.5"
+    end
 
     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
 
   ##
@@ -88,6 +111,11 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     get history_path(:format => "html", :display_name => user.display_name)
     assert_response :success
     assert_template "history"
+    assert_template :layout => "map"
+    assert_select "h2", :text => "Changesets by #{user.display_name}", :count => 1
+    assert_select "link[rel='alternate'][type='application/atom+xml']", :count => 1 do
+      assert_select "[href=?]", "http://www.example.com/user/#{ERB::Util.url_encode(user.display_name)}/history/feed"
+    end
 
     get history_path(:format => "html", :display_name => user.display_name, :list => "1"), :xhr => true
     assert_response :success
@@ -111,7 +139,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "index"
 
-    check_index_result(Changeset.none)
+    check_index_result([])
   end
 
   ##
@@ -131,11 +159,12 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
   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 friend_changesets_path
     assert_response :redirect
-    assert_redirected_to :controller => :users, :action => :login, :referer => friend_changesets_path
+    assert_redirected_to login_path(:referer => friend_changesets_path)
 
     session_for(private_user)
 
@@ -147,7 +176,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "index"
 
-    check_index_result(Changeset.where(:user => private_user.friends.identifiable))
+    check_index_result([changeset])
   end
 
   ##
@@ -155,11 +184,13 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
   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 nearby_changesets_path
     assert_response :redirect
-    assert_redirected_to :controller => :users, :action => :login, :referer => nearby_changesets_path
+    assert_redirected_to login_path(:referer => nearby_changesets_path)
 
     session_for(private_user)
 
@@ -171,23 +202,26 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     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 history_path(: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 history_path(: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
 
   ##
@@ -275,11 +309,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
   ##
   # 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