Merge pull request #5293 from AntonKhorev/user-roles-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 0b26165250fa00ccfa74333ec97a9ec27dd9db5e..a486e4b5ee87f98f955fe1de82d5647ec93d4cc1 100644 (file)
--- a/test/controllers/changesets_controller_test.rb
+++ b/test/controllers/changesets_controller_test.rb
@@ -92,6 +92,15 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     check_index_result(changesets.last(20))
   end
 
     check_index_result(changesets.last(20))
   end
 

+  ##
+  # This should report an error
+  def test_index_invalid_xhr
+    %w[-1 0 fred].each do |id|
+      get history_path(:format => "html", :list => "1", :max_id => id)
+      assert_redirected_to :controller => :errors, :action => :bad_request
+    end
+  end
+

   ##
   # 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


@@ -133,7 +142,9 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
     assert_template "history"
     assert_template :layout => "map"
     assert_response :success
     assert_template "history"
     assert_template :layout => "map"

-    assert_select "h2", :text => "Changesets by #{user.display_name}", :count => 1
+    assert_select "h2", :text => "Changesets by #{user.display_name}", :count => 1 do
+      assert_select "a[href=?]", user_path(user)
+    end

     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
     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


@@ -266,6 +277,7 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     assert_dom "p", :text => "tested-changeset-comment"
     assert_dom "li#c#{changeset_comment.id}" do
       assert_dom "> small", :text => /^Comment from #{commenting_user.display_name}/
     assert_dom "p", :text => "tested-changeset-comment"
     assert_dom "li#c#{changeset_comment.id}" do
       assert_dom "> small", :text => /^Comment from #{commenting_user.display_name}/

+      assert_dom "a[href='#{user_path(commenting_user)}']"

     end
   end
 
     end
   end
 


@@ -316,6 +328,28 @@ class ChangesetsControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
     end
   end
 

+  def test_show_adjacent_changesets
+    user = create(:user)
+    changesets = create_list(:changeset, 3, :user => user, :num_changes => 1)
+
+    sidebar_browse_check :changeset_path, changesets[1].id, "changesets/show"
+    assert_dom "a[href='#{changeset_path changesets[0]}']", :count => 1
+    assert_dom "a[href='#{changeset_path changesets[2]}']", :count => 1
+  end
+
+  def test_show_adjacent_nonempty_changesets
+    user = create(:user)
+    changeset1 = create(:changeset, :user => user, :num_changes => 1)
+    create(:changeset, :user => user, :num_changes => 0)
+    changeset3 = create(:changeset, :user => user, :num_changes => 1)
+    create(:changeset, :user => user, :num_changes => 0)
+    changeset5 = create(:changeset, :user => user, :num_changes => 1)
+
+    sidebar_browse_check :changeset_path, changeset3.id, "changesets/show"
+    assert_dom "a[href='#{changeset_path changeset1}']", :count => 1
+    assert_dom "a[href='#{changeset_path changeset5}']", :count => 1
+  end
+

   ##
   # This should display the last 20 non-empty changesets
   def test_feed
   ##
   # This should display the last 20 non-empty changesets
   def test_feed


@@ -402,7 +436,7 @@ 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
     assert_redirected_to login_path(:referer => path)
 
     get path
     assert_redirected_to login_path(:referer => path)


@@ -423,7 +457,7 @@ 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
     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)


@@ -437,20 +471,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
 


@@ -458,7 +492,7 @@ 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
     assert_redirected_to login_path(:referer => path)
 
     get path
     assert_redirected_to login_path(:referer => path)


@@ -481,7 +515,7 @@ 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
     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)


@@ -495,19 +529,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