Return an updated copy of the note from the delete call

[rails.git] / test / functional / notes_controller_test.rb

diff --git a/test/functional/notes_controller_test.rb b/test/functional/notes_controller_test.rb
index 1c50ee82e8382d85ea25ea679a8da2d0918d84f1..4bd0aa6cf418b09b6997c640d93ab12107796dbe 100644 (file)
--- a/test/functional/notes_controller_test.rb
+++ b/test/functional/notes_controller_test.rb
@@ -120,13 +120,23 @@ class NotesControllerTest < ActionController::TestCase
   def test_note_create_success
     assert_difference('Note.count') do
       assert_difference('NoteComment.count') do
   def test_note_create_success
     assert_difference('Note.count') do
       assert_difference('NoteComment.count') do

-        post :create, {:lat => -1.0, :lon => -1.0, :name => "new_tester", :text => "This is a comment"}
+        post :create, {:lat => -1.0, :lon => -1.0, :text => "This is a comment", :format => "json"}

       end
     end
     assert_response :success
       end
     end
     assert_response :success

-    id = @response.body.sub(/ok/,"").to_i
+    js = ActiveSupport::JSON.decode(@response.body)
+    assert_not_nil js
+    assert_equal "Feature", js["type"]
+    assert_equal "Point", js["geometry"]["type"]
+    assert_equal [-1.0, -1.0], js["geometry"]["coordinates"]
+    assert_equal "open", js["properties"]["status"]
+    assert_equal 1, js["properties"]["comments"].count
+    assert_equal "opened", js["properties"]["comments"].last["action"]
+    assert_equal "This is a comment", js["properties"]["comments"].last["text"]
+    assert_nil js["properties"]["comments"].last["user"]
+    id = js["properties"]["id"]

 
 

-    get :show, {:id => id, :format => 'json'}
+    get :show, {:id => id, :format => "json"}

     assert_response :success
     js = ActiveSupport::JSON.decode(@response.body)
     assert_not_nil js
     assert_response :success
     js = ActiveSupport::JSON.decode(@response.body)
     assert_not_nil js


@@ -138,41 +148,48 @@ class NotesControllerTest < ActionController::TestCase
     assert_equal 1, js["properties"]["comments"].count
     assert_equal "opened", js["properties"]["comments"].last["action"]
     assert_equal "This is a comment", js["properties"]["comments"].last["text"]
     assert_equal 1, js["properties"]["comments"].count
     assert_equal "opened", js["properties"]["comments"].last["action"]
     assert_equal "This is a comment", js["properties"]["comments"].last["text"]

-    assert_equal "new_tester (a)", js["properties"]["comments"].last["user"]
+    assert_nil js["properties"]["comments"].last["user"]

   end
 
   def test_note_create_fail
     assert_no_difference('Note.count') do
       assert_no_difference('NoteComment.count') do
   end
 
   def test_note_create_fail
     assert_no_difference('Note.count') do
       assert_no_difference('NoteComment.count') do

-        post :create, {:lon => -1.0, :name => "new_tester", :text => "This is a comment"}
+        post :create, {:lon => -1.0, :text => "This is a comment"}
+      end
+    end
+    assert_response :bad_request
+
+    assert_no_difference('Note.count') do
+      assert_no_difference('NoteComment.count') do
+        post :create, {:lat => -1.0, :text => "This is a comment"}

       end
     end
     assert_response :bad_request
 
     assert_no_difference('Note.count') do
       assert_no_difference('NoteComment.count') do
       end
     end
     assert_response :bad_request
 
     assert_no_difference('Note.count') do
       assert_no_difference('NoteComment.count') do

-        post :create, {:lat => -1.0, :name => "new_tester", :text => "This is a comment"}
+        post :create, {:lat => -1.0, :lon => -1.0}

       end
     end
     assert_response :bad_request
 
     assert_no_difference('Note.count') do
       assert_no_difference('NoteComment.count') do
       end
     end
     assert_response :bad_request
 
     assert_no_difference('Note.count') do
       assert_no_difference('NoteComment.count') do

-        post :create, {:lat => -1.0, :lon => -1.0, :name => "new_tester"}
+        post :create, {:lat => -1.0, :lon => -1.0, :text => ""}

       end
     end
     assert_response :bad_request
 
     assert_no_difference('Note.count') do
       assert_no_difference('NoteComment.count') do
       end
     end
     assert_response :bad_request
 
     assert_no_difference('Note.count') do
       assert_no_difference('NoteComment.count') do

-        post :create, {:lat => -100.0, :lon => -1.0, :name => "new_tester", :text => "This is a comment"}
+        post :create, {:lat => -100.0, :lon => -1.0, :text => "This is a comment"}

       end
     end
     assert_response :bad_request
 
     assert_no_difference('Note.count') do
       assert_no_difference('NoteComment.count') do
       end
     end
     assert_response :bad_request
 
     assert_no_difference('Note.count') do
       assert_no_difference('NoteComment.count') do

-        post :create, {:lat => -1.0, :lon => -200.0, :name => "new_tester", :text => "This is a comment"}
+        post :create, {:lat => -1.0, :lon => -200.0, :text => "This is a comment"}

       end
     end
     assert_response :bad_request
       end
     end
     assert_response :bad_request


@@ -180,11 +197,20 @@ class NotesControllerTest < ActionController::TestCase
 
   def test_note_comment_create_success
     assert_difference('NoteComment.count') do
 
   def test_note_comment_create_success
     assert_difference('NoteComment.count') do

-      post :comment, {:id => notes(:open_note_with_comment).id, :name => "new_tester2", :text => "This is an additional comment"}
+      post :comment, {:id => notes(:open_note_with_comment).id, :text => "This is an additional comment", :format => "json"}

     end
     assert_response :success
     end
     assert_response :success

+    js = ActiveSupport::JSON.decode(@response.body)
+    assert_not_nil js
+    assert_equal "Feature", js["type"]
+    assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
+    assert_equal "open", js["properties"]["status"]
+    assert_equal 3, js["properties"]["comments"].count
+    assert_equal "commented", js["properties"]["comments"].last["action"]
+    assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
+    assert_nil js["properties"]["comments"].last["user"]

 
 

-    get :show, {:id => notes(:open_note_with_comment).id, :format => 'json'}
+    get :show, {:id => notes(:open_note_with_comment).id, :format => "json"}

     assert_response :success
     js = ActiveSupport::JSON.decode(@response.body)
     assert_not_nil js
     assert_response :success
     js = ActiveSupport::JSON.decode(@response.body)
     assert_not_nil js


@@ -194,36 +220,60 @@ class NotesControllerTest < ActionController::TestCase
     assert_equal 3, js["properties"]["comments"].count
     assert_equal "commented", js["properties"]["comments"].last["action"]
     assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
     assert_equal 3, js["properties"]["comments"].count
     assert_equal "commented", js["properties"]["comments"].last["action"]
     assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]

-    assert_equal "new_tester2 (a)", js["properties"]["comments"].last["user"]
+    assert_nil js["properties"]["comments"].last["user"]

   end
 
   def test_note_comment_create_fail
     assert_no_difference('NoteComment.count') do
   end
 
   def test_note_comment_create_fail
     assert_no_difference('NoteComment.count') do

-      post :comment, {:name => "new_tester2", :text => "This is an additional comment"}
+      post :comment, {:text => "This is an additional comment"}

     end
     assert_response :bad_request
 
     assert_no_difference('NoteComment.count') do
     end
     assert_response :bad_request
 
     assert_no_difference('NoteComment.count') do

-      post :comment, {:id => notes(:open_note_with_comment).id, :name => "new_tester2"}
+      post :comment, {:id => notes(:open_note_with_comment).id}

     end
     assert_response :bad_request
 
     assert_no_difference('NoteComment.count') do
     end
     assert_response :bad_request
 
     assert_no_difference('NoteComment.count') do

-      post :comment, {:id => 12345, :name => "new_tester2", :text => "This is an additional comment"}
+      post :comment, {:id => notes(:open_note_with_comment).id, :text => ""}
+    end
+    assert_response :bad_request
+
+    assert_no_difference('NoteComment.count') do
+      post :comment, {:id => 12345, :text => "This is an additional comment"}

     end
     assert_response :not_found
 
     assert_no_difference('NoteComment.count') do
     end
     assert_response :not_found
 
     assert_no_difference('NoteComment.count') do

-      post :comment, {:id => notes(:hidden_note_with_comment).id, :name => "new_tester2", :text => "This is an additional comment"}
+      post :comment, {:id => notes(:hidden_note_with_comment).id, :text => "This is an additional comment"}

     end
     assert_response :gone
     end
     assert_response :gone

+
+    assert_no_difference('NoteComment.count') do
+      post :comment, {:id => notes(:closed_note_with_comment).id, :text => "This is an additional comment"}
+    end
+    assert_response :conflict

   end
 
   def test_note_close_success
   end
 
   def test_note_close_success

-    post :close, {:id => notes(:open_note_with_comment).id}
+    post :close, {:id => notes(:open_note_with_comment).id, :text => "This is a close comment", :format => "json"}
+    assert_response :unauthorized
+
+    basic_authorization(users(:public_user).email, "test")
+
+    post :close, {:id => notes(:open_note_with_comment).id, :text => "This is a close comment", :format => "json"}

     assert_response :success
     assert_response :success

+    js = ActiveSupport::JSON.decode(@response.body)
+    assert_not_nil js
+    assert_equal "Feature", js["type"]
+    assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
+    assert_equal "closed", js["properties"]["status"]
+    assert_equal 3, js["properties"]["comments"].count
+    assert_equal "closed", js["properties"]["comments"].last["action"]
+    assert_equal "This is a close comment", js["properties"]["comments"].last["text"]
+    assert_equal "test2", js["properties"]["comments"].last["user"]

 
 

-    get :show, {:id => notes(:open_note_with_comment).id, :format => 'json'}
+    get :show, {:id => notes(:open_note_with_comment).id, :format => "json"}

     assert_response :success
     js = ActiveSupport::JSON.decode(@response.body)
     assert_not_nil js
     assert_response :success
     js = ActiveSupport::JSON.decode(@response.body)
     assert_not_nil js


@@ -232,11 +282,16 @@ class NotesControllerTest < ActionController::TestCase
     assert_equal "closed", js["properties"]["status"]
     assert_equal 3, js["properties"]["comments"].count
     assert_equal "closed", js["properties"]["comments"].last["action"]
     assert_equal "closed", js["properties"]["status"]
     assert_equal 3, js["properties"]["comments"].count
     assert_equal "closed", js["properties"]["comments"].last["action"]

-    assert_equal nil, js["properties"]["comments"].last["text"]
-    assert_equal "NoName (a)", js["properties"]["comments"].last["user"]
+    assert_equal "This is a close comment", js["properties"]["comments"].last["text"]
+    assert_equal "test2", js["properties"]["comments"].last["user"]

   end
 
   def test_note_close_fail
   end
 
   def test_note_close_fail

+    post :close
+    assert_response :unauthorized
+
+    basic_authorization(users(:public_user).email, "test")
+

     post :close
     assert_response :bad_request
 
     post :close
     assert_response :bad_request
 


@@ -245,6 +300,9 @@ class NotesControllerTest < ActionController::TestCase
 
     post :close, {:id => notes(:hidden_note_with_comment).id}
     assert_response :gone
 
     post :close, {:id => notes(:hidden_note_with_comment).id}
     assert_response :gone

+
+    post :close, {:id => notes(:closed_note_with_comment).id}
+    assert_response :conflict

   end
 
   def test_note_read_success
   end
 
   def test_note_read_success


@@ -266,7 +324,7 @@ class NotesControllerTest < ActionController::TestCase
   end
 
   def test_note_read_hidden_comment
   end
 
   def test_note_read_hidden_comment

-    get :show, {:id => notes(:note_with_hidden_comment).id, :format => 'json'}
+    get :show, {:id => notes(:note_with_hidden_comment).id, :format => "json"}

     assert_response :success
     js = ActiveSupport::JSON.decode(@response.body)
     assert_not_nil js
     assert_response :success
     js = ActiveSupport::JSON.decode(@response.body)
     assert_not_nil js


@@ -277,9 +335,6 @@ class NotesControllerTest < ActionController::TestCase
   end
 
   def test_note_read_fail
   end
 
   def test_note_read_fail

-    post :show
-    assert_response :bad_request
-

     get :show, {:id => 12345}
     assert_response :not_found
 
     get :show, {:id => 12345}
     assert_response :not_found
 


@@ -288,21 +343,47 @@ class NotesControllerTest < ActionController::TestCase
   end
 
   def test_note_delete_success
   end
 
   def test_note_delete_success

-    delete :destroy, {:id => notes(:open_note_with_comment).id}
+    delete :destroy, {:id => notes(:open_note_with_comment).id, :text => "This is a hide comment", :format => "json"}
+    assert_response :unauthorized
+
+    basic_authorization(users(:public_user).email, "test")
+
+    delete :destroy, {:id => notes(:open_note_with_comment).id, :text => "This is a hide comment", :format => "json"}
+    assert_response :forbidden
+
+    basic_authorization(users(:moderator_user).email, "test")
+
+    delete :destroy, {:id => notes(:open_note_with_comment).id, :text => "This is a hide comment", :format => "json"}

     assert_response :success
     assert_response :success

+    js = ActiveSupport::JSON.decode(@response.body)
+    assert_not_nil js
+    assert_equal "Feature", js["type"]
+    assert_equal notes(:open_note_with_comment).id, js["properties"]["id"]
+    assert_equal "hidden", js["properties"]["status"]
+    assert_equal 3, js["properties"]["comments"].count
+    assert_equal "hidden", js["properties"]["comments"].last["action"]
+    assert_equal "This is a hide comment", js["properties"]["comments"].last["text"]
+    assert_equal "moderator", js["properties"]["comments"].last["user"]

 
     get :show, {:id => notes(:open_note_with_comment).id, :format => 'json'}
     assert_response :gone
   end
 
   def test_note_delete_fail
 
     get :show, {:id => notes(:open_note_with_comment).id, :format => 'json'}
     assert_response :gone
   end
 
   def test_note_delete_fail

-    delete :destroy
-    assert_response :bad_request
+    delete :destroy, {:id => 12345, :format => "json"}
+    assert_response :unauthorized
+
+    basic_authorization(users(:public_user).email, "test")
+
+    delete :destroy, {:id => 12345, :format => "json"}
+    assert_response :forbidden
+
+    basic_authorization(users(:moderator_user).email, "test")

 
 

-    delete :destroy, {:id => 12345}
+    delete :destroy, {:id => 12345, :format => "json"}

     assert_response :not_found
 
     assert_response :not_found
 

-    delete :destroy, {:id => notes(:hidden_note_with_comment).id}
+    delete :destroy, {:id => notes(:hidden_note_with_comment).id, :format => "json"}

     assert_response :gone
   end
 
     assert_response :gone
   end
 


@@ -412,31 +493,31 @@ class NotesControllerTest < ActionController::TestCase
   end
 
   def test_rss_success
   end
 
   def test_rss_success

-    get :feed, {:format => 'rss'}
+    get :feed, {:format => "rss"}

     assert_response :success
     assert_equal "application/rss+xml", @response.content_type
 
     assert_response :success
     assert_equal "application/rss+xml", @response.content_type
 

-    get :feed, {:bbox=>'1,1,1.2,1.2', :format => 'rss'}
+    get :feed, {:bbox => "1,1,1.2,1.2", :format => "rss"}

     assert_response :success   
     assert_equal "application/rss+xml", @response.content_type
   end
 
   def test_rss_fail
     assert_response :success   
     assert_equal "application/rss+xml", @response.content_type
   end
 
   def test_rss_fail

-    get :feed, {:bbox=>'1,1,1.2'}
+    get :feed, {:bbox => "1,1,1.2"}

     assert_response :bad_request
 
     assert_response :bad_request
 

-    get :feed, {:bbox=>'1,1,1.2,1.2,1.2'}
+    get :feed, {:bbox => "1,1,1.2,1.2,1.2"}

     assert_response :bad_request
   end
 
   def test_user_notes_success
     assert_response :bad_request
   end
 
   def test_user_notes_success

-    get :mine, {:display_name=>'test'}
+    get :mine, {:display_name => "test"}

     assert_response :success
 
     assert_response :success
 

-    get :mine, {:display_name=>'pulibc_test2'}
+    get :mine, {:display_name => "pulibc_test2"}

     assert_response :success
 
     assert_response :success
 

-    get :mine, {:display_name=>'non-existent'}
+    get :mine, {:display_name => "non-existent"}

     assert_response :not_found 
   end
 end
     assert_response :not_found 
   end
 end