Bump image_processing from 1.12.1 to 1.12.2

[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 a5ce2aa62ce8c60a8b29b864aafb0ca1729629f9..31a1e2d0c77b43d35d263491aabadd8899bc7443 100644 (file)
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -40,6 +40,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_template "history"
     assert_template :layout => "map"
     assert_select "h2", :text => "Changesets", :count => 1
     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
 
     get history_path(:format => "html", :list => "1"), :xhr => true
     assert_response :success


@@ -58,6 +61,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_template "history"
     assert_template :layout => "xhr"
     assert_select "h2", :text => "Changesets", :count => 1
     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
 
     get history_path(:format => "html", :list => "1"), :xhr => true
     assert_response :success


@@ -84,6 +90,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_template "history"
     assert_template :layout => "map"
     assert_select "h2", :text => "Changesets", :count => 1
     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
 
     get history_path(:format => "html", :bbox => "4.5,4.5,5.5,5.5", :list => "1"), :xhr => true
     assert_response :success


@@ -102,6 +111,11 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     get history_path(:format => "html", :display_name => user.display_name)
     assert_response :success
     assert_template "history"
     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
 
     get history_path(:format => "html", :display_name => user.display_name, :list => "1"), :xhr => true
     assert_response :success


@@ -150,7 +164,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
 
     get friend_changesets_path
     assert_response :redirect
 
     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)
 
 
     session_for(private_user)
 


@@ -176,7 +190,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
 
     get nearby_changesets_path
     assert_response :redirect
 
     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)
 
 
     session_for(private_user)