Move changeset subscribe/unsubscribe to resourceful routes

[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 14aa743b6278bd9be1c245ba8e79d7c2cab4b441..ae5a28021bb40e8a0c3f6821110b9d0c483a2fe0 100644 (file)
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -125,8 +125,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
   # Checks the display of the user changesets listing
   def test_index_user
     user = create(:user)
   # Checks the display of the user changesets listing
   def test_index_user
     user = create(:user)

-    create(:changeset, :user => user)
-    create(:changeset, :closed, :user => user)
+    create(:changeset, :user => user, :num_changes => 1)
+    create(:changeset, :closed, :user => user, :num_changes => 1)
+    user.reload

 
     get history_path(:format => "html", :display_name => user.display_name)
     assert_response :success
 
     get history_path(:format => "html", :display_name => user.display_name)
     assert_response :success


@@ -183,7 +184,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     _changeset2 = create(:changeset, :user => create(:user), :num_changes => 1)
 
     get friend_changesets_path
     _changeset2 = create(:changeset, :user => create(:user), :num_changes => 1)
 
     get friend_changesets_path

-    assert_response :redirect

     assert_redirected_to login_path(:referer => friend_changesets_path)
 
     session_for(private_user)
     assert_redirected_to login_path(:referer => friend_changesets_path)
 
     session_for(private_user)


@@ -209,7 +209,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     _changeset2 = create(:changeset, :user => far_away_user, :num_changes => 1)
 
     get nearby_changesets_path
     _changeset2 = create(:changeset, :user => far_away_user, :num_changes => 1)
 
     get nearby_changesets_path

-    assert_response :redirect

     assert_redirected_to login_path(:referer => nearby_changesets_path)
 
     session_for(private_user)
     assert_redirected_to login_path(:referer => nearby_changesets_path)
 
     session_for(private_user)


@@ -270,6 +269,12 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
     end
   end
 

+  def test_show_closed_changeset
+    changeset = create(:changeset, :closed)
+
+    sidebar_browse_check :changeset_path, changeset.id, "changesets/show"
+  end
+

   def test_show_private_changeset
     user = create(:user)
     changeset = create(:changeset, :user => create(:user, :data_public => false))
   def test_show_private_changeset
     user = create(:user)
     changeset = create(:changeset, :user => create(:user, :data_public => false))


@@ -281,10 +286,34 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
   def test_show_element_links
     changeset = create(:changeset)
     node = create(:node, :with_history, :changeset => changeset)
   def test_show_element_links
     changeset = create(:changeset)
     node = create(:node, :with_history, :changeset => changeset)

+    way = create(:way, :with_history, :changeset => changeset)
+    relation = create(:relation, :with_history, :changeset => changeset)

 
     sidebar_browse_check :changeset_path, changeset.id, "changesets/show"
     assert_dom "a[href='#{node_path node}']", :count => 1
     assert_dom "a[href='#{old_node_path node, 1}']", :count => 1
 
     sidebar_browse_check :changeset_path, changeset.id, "changesets/show"
     assert_dom "a[href='#{node_path node}']", :count => 1
     assert_dom "a[href='#{old_node_path node, 1}']", :count => 1

+    assert_dom "a[href='#{way_path way}']", :count => 1
+    assert_dom "a[href='#{old_way_path way, 1}']", :count => 1
+    assert_dom "a[href='#{relation_path relation}']", :count => 1
+    assert_dom "a[href='#{old_relation_path relation, 1}']", :count => 1
+  end
+
+  def test_show_paginated_element_links
+    page_size = 20
+    changeset = create(:changeset)
+    nodes = create_list(:node, page_size + 1, :with_history, :changeset => changeset)
+    ways = create_list(:way, page_size + 1, :with_history, :changeset => changeset)
+    relations = create_list(:relation, page_size + 1, :with_history, :changeset => changeset)
+
+    sidebar_browse_check :changeset_path, changeset.id, "changesets/show"
+    page_size.times do |i|
+      assert_dom "a[href='#{node_path nodes[i]}']", :count => 1
+      assert_dom "a[href='#{old_node_path nodes[i], 1}']", :count => 1
+      assert_dom "a[href='#{way_path ways[i]}']", :count => 1
+      assert_dom "a[href='#{old_way_path ways[i], 1}']", :count => 1
+      assert_dom "a[href='#{relation_path relations[i]}']", :count => 1
+      assert_dom "a[href='#{old_relation_path relations[i], 1}']", :count => 1
+    end

   end
 
   ##
   end
 
   ##


@@ -366,7 +395,6 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
   # Check that we can't request later pages of the changesets feed
   def test_feed_max_id
     get history_feed_path(:format => "atom", :max_id => 100)
   # Check that we can't request later pages of the changesets feed
   def test_feed_max_id
     get history_feed_path(:format => "atom", :max_id => 100)

-    assert_response :redirect

     assert_redirected_to :action => :feed
   end
 
     assert_redirected_to :action => :feed
   end
 


@@ -374,10 +402,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     user = create(:user)
     other_user = create(:user)
     changeset = create(:changeset, :user => user)
     user = create(:user)
     other_user = create(:user)
     changeset = create(:changeset, :user => user)

-    path = changeset_subscribe_path(changeset)
+    path = subscribe_changeset_path(changeset)

 
     get path
 
     get path

-    assert_response :redirect

     assert_redirected_to login_path(:referer => path)
 
     session_for(other_user)
     assert_redirected_to login_path(:referer => path)
 
     session_for(other_user)


@@ -396,9 +423,8 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
 
     session_for(other_user)
     assert_difference "changeset.subscribers.count", 1 do
 
     session_for(other_user)
     assert_difference "changeset.subscribers.count", 1 do

-      post changeset_subscribe_path(changeset)
+      post subscribe_changeset_path(changeset)

     end
     end

-    assert_response :redirect

     assert_redirected_to changeset_path(changeset)
     assert changeset.reload.subscribed?(other_user)
   end
     assert_redirected_to changeset_path(changeset)
     assert changeset.reload.subscribed?(other_user)
   end


@@ -411,20 +437,20 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
 
     # not signed in
     assert_no_difference "changeset.subscribers.count" do
 
     # not signed in
     assert_no_difference "changeset.subscribers.count" do

-      post changeset_subscribe_path(changeset)
+      post subscribe_changeset_path(changeset)

     end
     assert_response :forbidden
 
     session_for(other_user)
 
     # bad diary id
     end
     assert_response :forbidden
 
     session_for(other_user)
 
     # bad diary id

-    post changeset_subscribe_path(999111)
+    post subscribe_changeset_path(999111)

     assert_response :not_found
 
     # trying to subscribe when already subscribed
     assert_response :not_found
 
     # trying to subscribe when already subscribed

-    post changeset_subscribe_path(changeset)
+    post subscribe_changeset_path(changeset)

     assert_no_difference "changeset.subscribers.count" do
     assert_no_difference "changeset.subscribers.count" do

-      post changeset_subscribe_path(changeset)
+      post subscribe_changeset_path(changeset)

     end
   end
 
     end
   end
 


@@ -432,10 +458,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     user = create(:user)
     other_user = create(:user)
     changeset = create(:changeset, :user => user)
     user = create(:user)
     other_user = create(:user)
     changeset = create(:changeset, :user => user)

-    path = changeset_unsubscribe_path(changeset)
+    path = unsubscribe_changeset_path(changeset)

 
     get path
 
     get path

-    assert_response :redirect

     assert_redirected_to login_path(:referer => path)
 
     session_for(other_user)
     assert_redirected_to login_path(:referer => path)
 
     session_for(other_user)


@@ -456,9 +481,8 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
 
     session_for(other_user)
     assert_difference "changeset.subscribers.count", -1 do
 
     session_for(other_user)
     assert_difference "changeset.subscribers.count", -1 do

-      post changeset_unsubscribe_path(changeset)
+      post unsubscribe_changeset_path(changeset)

     end
     end

-    assert_response :redirect

     assert_redirected_to changeset_path(changeset)
     assert_not changeset.reload.subscribed?(other_user)
   end
     assert_redirected_to changeset_path(changeset)
     assert_not changeset.reload.subscribed?(other_user)
   end


@@ -471,19 +495,19 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
 
     # not signed in
     assert_no_difference "changeset.subscribers.count" do
 
     # not signed in
     assert_no_difference "changeset.subscribers.count" do

-      post changeset_unsubscribe_path(changeset)
+      post unsubscribe_changeset_path(changeset)

     end
     assert_response :forbidden
 
     session_for(other_user)
 
     # bad diary id
     end
     assert_response :forbidden
 
     session_for(other_user)
 
     # bad diary id

-    post changeset_unsubscribe_path(999111)
+    post unsubscribe_changeset_path(999111)

     assert_response :not_found
 
     # trying to unsubscribe when not subscribed
     assert_no_difference "changeset.subscribers.count" do
     assert_response :not_found
 
     # trying to unsubscribe when not subscribed
     assert_no_difference "changeset.subscribers.count" do

-      post changeset_unsubscribe_path(changeset)
+      post unsubscribe_changeset_path(changeset)

     end
   end
 
     end
   end