Add extra tests for API and redaction controllers

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

diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
index 8eb9337447dd2a5fc65a60fa62055bffbc03cae6..6a443850ffd5ac9b245c4d1513ae05462dce43b5 100644 (file)
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -180,6 +180,7 @@ class ChangesetControllerTest < ActionController::TestCase
   # document structure.
   def test_read
     changeset_id = changesets(:normal_user_first_change).id
   # document structure.
   def test_read
     changeset_id = changesets(:normal_user_first_change).id

+

     get :read, :id => changeset_id
     assert_response :success, "cannot get first changeset"
 
     get :read, :id => changeset_id
     assert_response :success, "cannot get first changeset"
 


@@ -193,6 +194,17 @@ class ChangesetControllerTest < ActionController::TestCase
     assert_select "osm[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
     assert_select "osm>changeset[id='#{changeset_id}']", 1
     assert_select "osm>changeset>discussion", 1
     assert_select "osm[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
     assert_select "osm>changeset[id='#{changeset_id}']", 1
     assert_select "osm>changeset>discussion", 1

+    assert_select "osm>changeset>discussion>comment", 0
+
+    changeset_id = changesets(:normal_user_closed_change).id
+
+    get :read, :id => changeset_id, :include_discussion => true
+    assert_response :success, "cannot get closed changeset with comments"
+
+    assert_select "osm[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1
+    assert_select "osm>changeset[id='#{changeset_id}']", 1
+    assert_select "osm>changeset>discussion", 1
+    assert_select "osm>changeset>discussion>comment", 3

   end
 
   ##
   end
 
   ##


@@ -517,7 +529,7 @@ EOF
       content "<osm><changeset>" +
         "<tag k='created_by' v='osm test suite checking changesets'/>" +
         "</changeset></osm>"
       content "<osm><changeset>" +
         "<tag k='created_by' v='osm test suite checking changesets'/>" +
         "</changeset></osm>"

-      assert_difference("Changeset.count", 1) do
+      assert_difference "Changeset.count", 1 do

         put :create
       end
       assert_response :success
         put :create
       end
       assert_response :success


@@ -1872,10 +1884,35 @@ EOF
   def test_create_comment_success
     basic_authorization(users(:public_user).email, "test")
 
   def test_create_comment_success
     basic_authorization(users(:public_user).email, "test")
 

-    assert_difference("ChangesetComment.count") do
-      post :comment, :id => changesets(:normal_user_closed_change).id, :text => "This is a comment"
+    assert_difference "ChangesetComment.count", 1 do
+      assert_no_difference "ActionMailer::Base.deliveries.size" do
+        post :comment, :id => changesets(:normal_user_closed_change).id, :text => "This is a comment"
+      end
+    end
+    assert_response :success
+
+    assert_difference "ChangesetComment.count", 1 do
+      assert_no_difference "ActionMailer::Base.deliveries.size" do
+        post :comment, :id => changesets(:normal_user_subscribed_change).id, :text => "This is a comment"
+      end
+    end
+    assert_response :success
+
+    basic_authorization(users(:second_public_user).email, "test")
+
+    assert_difference "ChangesetComment.count", 1 do
+      assert_difference "ActionMailer::Base.deliveries.size", 1 do
+        post :comment, :id => changesets(:normal_user_subscribed_change).id, :text => "This is a comment"
+      end

     end
     assert_response :success
     end
     assert_response :success

+
+    email = ActionMailer::Base.deliveries.first
+    assert_equal 1, email.to.length
+    assert_equal "[OpenStreetMap] pulibc_test2 has commented on a changeset you are interested in", email.subject
+    assert_equal "test@example.com", email.to.first
+
+    ActionMailer::Base.deliveries.clear

   end
 
   ##
   end
 
   ##


@@ -1888,25 +1925,25 @@ EOF
     basic_authorization(users(:public_user).email, "test")
 
     # bad changeset id
     basic_authorization(users(:public_user).email, "test")
 
     # bad changeset id

-    assert_no_difference("ChangesetComment.count") do
+    assert_no_difference "ChangesetComment.count" do

       post :comment, :id => 999111, :text => "This is a comment"
     end
     assert_response :not_found
 
     # not closed changeset
       post :comment, :id => 999111, :text => "This is a comment"
     end
     assert_response :not_found
 
     # not closed changeset

-    assert_no_difference("ChangesetComment.count") do
+    assert_no_difference "ChangesetComment.count" do

       post :comment, :id => changesets(:normal_user_first_change).id, :text => "This is a comment"
     end
     assert_response :conflict
 
     # no text
       post :comment, :id => changesets(:normal_user_first_change).id, :text => "This is a comment"
     end
     assert_response :conflict
 
     # no text

-    assert_no_difference("ChangesetComment.count") do
+    assert_no_difference "ChangesetComment.count" do

       post :comment, :id => changesets(:normal_user_closed_change).id
     end
     assert_response :bad_request
 
     # empty text
       post :comment, :id => changesets(:normal_user_closed_change).id
     end
     assert_response :bad_request
 
     # empty text

-    assert_no_difference("ChangesetComment.count") do
+    assert_no_difference "ChangesetComment.count" do

       post :comment, :id => changesets(:normal_user_closed_change).id, :text => ""
     end
     assert_response :bad_request
       post :comment, :id => changesets(:normal_user_closed_change).id, :text => ""
     end
     assert_response :bad_request


@@ -1918,7 +1955,7 @@ EOF
     basic_authorization(users(:public_user).email, "test")
     changeset = changesets(:normal_user_closed_change)
 
     basic_authorization(users(:public_user).email, "test")
     changeset = changesets(:normal_user_closed_change)
 

-    assert_difference("changeset.subscribers.count") do
+    assert_difference "changeset.subscribers.count", 1 do

       post :subscribe, :id => changeset.id
     end
     assert_response :success
       post :subscribe, :id => changeset.id
     end
     assert_response :success


@@ -1929,7 +1966,7 @@ EOF
   def test_subscribe_fail
     # unauthorized
     changeset = changesets(:normal_user_closed_change)
   def test_subscribe_fail
     # unauthorized
     changeset = changesets(:normal_user_closed_change)

-    assert_no_difference("changeset.subscribers.count") do
+    assert_no_difference "changeset.subscribers.count" do

       post :subscribe, :id => changeset.id
     end
     assert_response :unauthorized
       post :subscribe, :id => changeset.id
     end
     assert_response :unauthorized


@@ -1937,21 +1974,21 @@ EOF
     basic_authorization(users(:public_user).email, "test")
 
     # bad changeset id
     basic_authorization(users(:public_user).email, "test")
 
     # bad changeset id

-    assert_no_difference("changeset.subscribers.count") do
+    assert_no_difference "changeset.subscribers.count" do

       post :subscribe, :id => 999111
     end
     assert_response :not_found
 
     # not closed changeset
     changeset = changesets(:normal_user_first_change)
       post :subscribe, :id => 999111
     end
     assert_response :not_found
 
     # not closed changeset
     changeset = changesets(:normal_user_first_change)

-    assert_no_difference("changeset.subscribers.count") do
+    assert_no_difference "changeset.subscribers.count" do

       post :subscribe, :id => changeset.id
     end
     assert_response :conflict
 
     # trying to subscribe when already subscribed
     changeset = changesets(:normal_user_subscribed_change)
       post :subscribe, :id => changeset.id
     end
     assert_response :conflict
 
     # trying to subscribe when already subscribed
     changeset = changesets(:normal_user_subscribed_change)

-    assert_no_difference("changeset.subscribers.count") do
+    assert_no_difference "changeset.subscribers.count" do

       post :subscribe, :id => changeset.id
     end
     assert_response :conflict
       post :subscribe, :id => changeset.id
     end
     assert_response :conflict


@@ -1963,7 +2000,7 @@ EOF
     basic_authorization(users(:public_user).email, "test")
     changeset = changesets(:normal_user_subscribed_change)
 
     basic_authorization(users(:public_user).email, "test")
     changeset = changesets(:normal_user_subscribed_change)
 

-    assert_difference("changeset.subscribers.count", -1) do
+    assert_difference "changeset.subscribers.count", -1 do

       post :unsubscribe, :id => changeset.id
     end
     assert_response :success
       post :unsubscribe, :id => changeset.id
     end
     assert_response :success


@@ -1974,7 +2011,7 @@ EOF
   def test_unsubscribe_fail
     # unauthorized
     changeset = changesets(:normal_user_closed_change)
   def test_unsubscribe_fail
     # unauthorized
     changeset = changesets(:normal_user_closed_change)

-    assert_no_difference("changeset.subscribers.count") do
+    assert_no_difference "changeset.subscribers.count" do

       post :unsubscribe, :id => changeset.id
     end
     assert_response :unauthorized
       post :unsubscribe, :id => changeset.id
     end
     assert_response :unauthorized


@@ -1982,21 +2019,21 @@ EOF
     basic_authorization(users(:public_user).email, "test")
 
     # bad changeset id
     basic_authorization(users(:public_user).email, "test")
 
     # bad changeset id

-    assert_no_difference("changeset.subscribers.count", -1) do
+    assert_no_difference "changeset.subscribers.count" do

       post :unsubscribe, :id => 999111
     end
     assert_response :not_found
 
     # not closed changeset
     changeset = changesets(:normal_user_first_change)
       post :unsubscribe, :id => 999111
     end
     assert_response :not_found
 
     # not closed changeset
     changeset = changesets(:normal_user_first_change)

-    assert_no_difference("changeset.subscribers.count", -1) do
+    assert_no_difference "changeset.subscribers.count" do

       post :unsubscribe, :id => changeset.id
     end
     assert_response :conflict
 
     # trying to unsubscribe when not subscribed
     changeset = changesets(:normal_user_closed_change)
       post :unsubscribe, :id => changeset.id
     end
     assert_response :conflict
 
     # trying to unsubscribe when not subscribed
     changeset = changesets(:normal_user_closed_change)

-    assert_no_difference("changeset.subscribers.count") do
+    assert_no_difference "changeset.subscribers.count" do

       post :unsubscribe, :id => changeset.id
     end
     assert_response :not_found
       post :unsubscribe, :id => changeset.id
     end
     assert_response :not_found