Subscribe users when they interact with notes

[rails.git] / test / controllers / api / notes_controller_test.rb

diff --git a/test/controllers/api/notes_controller_test.rb b/test/controllers/api/notes_controller_test.rb
index a03b84ae8e2130676e101b2d0414943dfa5381bd..f814d8c6e6424c13ec0788a5d5f4e170d6ca3da3 100644 (file)
--- a/test/controllers/api/notes_controller_test.rb
+++ b/test/controllers/api/notes_controller_test.rb
@@ -99,33 +99,14 @@ module Api
         { :path => "/api/0.6/notes/feed", :method => :get },
         { :controller => "api/notes", :action => "feed", :format => "rss" }
       )
         { :path => "/api/0.6/notes/feed", :method => :get },
         { :controller => "api/notes", :action => "feed", :format => "rss" }
       )

-
-      assert_recognizes(
-        { :controller => "api/notes", :action => "create" },
-        { :path => "/api/0.6/notes/addPOIexec", :method => :post }
-      )
-      assert_recognizes(
-        { :controller => "api/notes", :action => "close" },
-        { :path => "/api/0.6/notes/closePOIexec", :method => :post }
-      )
-      assert_recognizes(
-        { :controller => "api/notes", :action => "comment" },
-        { :path => "/api/0.6/notes/editPOIexec", :method => :post }
-      )
-      assert_recognizes(
-        { :controller => "api/notes", :action => "index", :format => "gpx" },
-        { :path => "/api/0.6/notes/getGPX", :method => :get }
-      )
-      assert_recognizes(
-        { :controller => "api/notes", :action => "feed", :format => "rss" },
-        { :path => "/api/0.6/notes/getRSSfeed", :method => :get }
-      )

     end
 
     end
 

-    def test_create_success
+    def test_create_anonymous_success

       assert_difference "Note.count", 1 do
         assert_difference "NoteComment.count", 1 do
       assert_difference "Note.count", 1 do
         assert_difference "NoteComment.count", 1 do

-          post api_notes_path(:lat => -1.0, :lon => -1.0, :text => "This is a comment", :format => "json")
+          assert_no_difference "NoteSubscription.count" do
+            post api_notes_path(:lat => -1.0, :lon => -1.0, :text => "This is a comment", :format => "json")
+          end

         end
       end
       assert_response :success
         end
       end
       assert_response :success


@@ -141,7 +122,7 @@ module Api
       assert_nil js["properties"]["comments"].last["user"]
       id = js["properties"]["id"]
 
       assert_nil js["properties"]["comments"].last["user"]
       id = js["properties"]["id"]
 

-      get api_note_path(:id => id, :format => "json")
+      get api_note_path(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


@@ -156,7 +137,7 @@ module Api
       assert_nil js["properties"]["comments"].last["user"]
     end
 
       assert_nil js["properties"]["comments"].last["user"]
     end
 

-    def test_create_fail
+    def test_create_anonymous_fail

       assert_no_difference "Note.count" do
         assert_no_difference "NoteComment.count" do
           post api_notes_path(:lon => -1.0, :text => "This is a comment")
       assert_no_difference "Note.count" do
         assert_no_difference "NoteComment.count" do
           post api_notes_path(:lon => -1.0, :text => "This is a comment")


@@ -221,14 +202,44 @@ module Api
       assert_response :bad_request
     end
 
       assert_response :bad_request
     end
 

+    def test_create_success
+      user = create(:user)
+      auth_header = bearer_authorization_header user
+      assert_difference "Note.count", 1 do
+        assert_difference "NoteComment.count", 1 do
+          assert_difference "NoteSubscription.count", 1 do
+            post api_notes_path(:lat => -1.0, :lon => -1.0, :text => "This is a comment", :format => "json"), :headers => auth_header
+          end
+        end
+      end
+      assert_response :success
+      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_equal user.display_name, js["properties"]["comments"].last["user"]
+
+      note = Note.last
+      subscription = NoteSubscription.last
+      assert_equal user, subscription.user
+      assert_equal note, subscription.note
+    end
+

     def test_comment_success
       open_note_with_comment = create(:note_with_comments)
       user = create(:user)
     def test_comment_success
       open_note_with_comment = create(:note_with_comments)
       user = create(:user)

-      auth_header = basic_authorization_header user.email, "test"
+      auth_header = bearer_authorization_header user

       assert_difference "NoteComment.count", 1 do
       assert_difference "NoteComment.count", 1 do

-        assert_no_difference "ActionMailer::Base.deliveries.size" do
-          perform_enqueued_jobs do
-            post comment_api_note_path(:id => open_note_with_comment, :text => "This is an additional comment", :format => "json"), :headers => auth_header
+        assert_difference "NoteSubscription.count", 1 do
+          assert_no_difference "ActionMailer::Base.deliveries.size" do
+            perform_enqueued_jobs do
+              post comment_api_note_path(open_note_with_comment, :text => "This is an additional comment", :format => "json"), :headers => auth_header
+            end

           end
         end
       end
           end
         end
       end


@@ -243,7 +254,11 @@ module Api
       assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
       assert_equal user.display_name, js["properties"]["comments"].last["user"]
 
       assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
       assert_equal user.display_name, js["properties"]["comments"].last["user"]
 

-      get api_note_path(:id => open_note_with_comment, :format => "json")
+      subscription = NoteSubscription.last
+      assert_equal user, subscription.user
+      assert_equal open_note_with_comment, subscription.note
+
+      get api_note_path(open_note_with_comment, :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


@@ -254,7 +269,9 @@ module Api
       assert_equal "commented", js["properties"]["comments"].last["action"]
       assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
       assert_equal user.display_name, js["properties"]["comments"].last["user"]
       assert_equal "commented", js["properties"]["comments"].last["action"]
       assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
       assert_equal user.display_name, js["properties"]["comments"].last["user"]

+    end

 
 

+    def test_comment_with_notifications_success

       # Ensure that emails are sent to users
       first_user = create(:user)
       second_user = create(:user)
       # Ensure that emails are sent to users
       first_user = create(:user)
       second_user = create(:user)


@@ -265,12 +282,14 @@ module Api
         create(:note_comment, :note => note, :author => second_user)
       end
 
         create(:note_comment, :note => note, :author => second_user)
       end
 

-      auth_header = basic_authorization_header third_user.email, "test"
+      auth_header = bearer_authorization_header third_user

 
       assert_difference "NoteComment.count", 1 do
 
       assert_difference "NoteComment.count", 1 do

-        assert_difference "ActionMailer::Base.deliveries.size", 2 do
-          perform_enqueued_jobs do
-            post comment_api_note_path(:id => note_with_comments_by_users, :text => "This is an additional comment", :format => "json"), :headers => auth_header
+        assert_difference "NoteSubscription.count", 1 do
+          assert_difference "ActionMailer::Base.deliveries.size", 2 do
+            perform_enqueued_jobs do
+              post comment_api_note_path(note_with_comments_by_users, :text => "This is an additional comment", :format => "json"), :headers => auth_header
+            end

           end
         end
       end
           end
         end
       end


@@ -285,6 +304,10 @@ module Api
       assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
       assert_equal third_user.display_name, js["properties"]["comments"].last["user"]
 
       assert_equal "This is an additional comment", js["properties"]["comments"].last["text"]
       assert_equal third_user.display_name, js["properties"]["comments"].last["user"]
 

+      subscription = NoteSubscription.last
+      assert_equal third_user, subscription.user
+      assert_equal note_with_comments_by_users, subscription.note
+

       email = ActionMailer::Base.deliveries.find { |e| e.to.first == first_user.email }
       assert_not_nil email
       assert_equal 1, email.to.length
       email = ActionMailer::Base.deliveries.find { |e| e.to.first == first_user.email }
       assert_not_nil email
       assert_equal 1, email.to.length


@@ -296,7 +319,7 @@ module Api
       assert_equal 1, email.to.length
       assert_equal "[OpenStreetMap] #{third_user.display_name} has commented on a note you are interested in", email.subject
 
       assert_equal 1, email.to.length
       assert_equal "[OpenStreetMap] #{third_user.display_name} has commented on a note you are interested in", email.subject
 

-      get api_note_path(:id => note_with_comments_by_users, :format => "json")
+      get api_note_path(note_with_comments_by_users, :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


@@ -311,49 +334,86 @@ module Api
       ActionMailer::Base.deliveries.clear
     end
 
       ActionMailer::Base.deliveries.clear
     end
 

+    def test_comment_twice_success
+      open_note_with_comment = create(:note_with_comments)
+      user = create(:user)
+      auth_header = bearer_authorization_header user
+      assert_difference "NoteComment.count", 1 do
+        assert_difference "NoteSubscription.count", 1 do
+          assert_no_difference "ActionMailer::Base.deliveries.size" do
+            perform_enqueued_jobs do
+              post comment_api_note_path(open_note_with_comment, :text => "This is an additional comment", :format => "json"), :headers => auth_header
+            end
+          end
+        end
+      end
+      assert_response :success
+      js = ActiveSupport::JSON.decode(@response.body)
+      assert_not_nil js
+      assert_equal 2, js["properties"]["comments"].count
+
+      subscription = NoteSubscription.last
+      assert_equal user, subscription.user
+      assert_equal open_note_with_comment, subscription.note
+
+      assert_difference "NoteComment.count", 1 do
+        assert_no_difference "NoteSubscription.count" do
+          assert_no_difference "ActionMailer::Base.deliveries.size" do
+            perform_enqueued_jobs do
+              post comment_api_note_path(open_note_with_comment, :text => "This is a second additional comment", :format => "json"), :headers => auth_header
+            end
+          end
+        end
+      end
+      assert_response :success
+      js = ActiveSupport::JSON.decode(@response.body)
+      assert_not_nil js
+      assert_equal 3, js["properties"]["comments"].count
+    end
+

     def test_comment_fail
       open_note_with_comment = create(:note_with_comments)
 
       user = create(:user)
 
       assert_no_difference "NoteComment.count" do
     def test_comment_fail
       open_note_with_comment = create(:note_with_comments)
 
       user = create(:user)
 
       assert_no_difference "NoteComment.count" do

-        post comment_api_note_path(:id => open_note_with_comment)
+        post comment_api_note_path(open_note_with_comment)

         assert_response :unauthorized
       end
 
         assert_response :unauthorized
       end
 

-      auth_header = basic_authorization_header user.email, "test"
+      auth_header = bearer_authorization_header user

 
       assert_no_difference "NoteComment.count" do
 
       assert_no_difference "NoteComment.count" do

-        post comment_api_note_path(:id => open_note_with_comment), :headers => auth_header
+        post comment_api_note_path(open_note_with_comment), :headers => auth_header

       end
       assert_response :bad_request
 
       assert_no_difference "NoteComment.count" do
       end
       assert_response :bad_request
 
       assert_no_difference "NoteComment.count" do

-        post comment_api_note_path(:id => open_note_with_comment, :text => ""), :headers => auth_header
+        post comment_api_note_path(open_note_with_comment, :text => ""), :headers => auth_header

       end
       assert_response :bad_request
 
       assert_no_difference "NoteComment.count" do
       end
       assert_response :bad_request
 
       assert_no_difference "NoteComment.count" do

-        post comment_api_note_path(:id => 12345, :text => "This is an additional comment"), :headers => auth_header
+        post comment_api_note_path(12345, :text => "This is an additional comment"), :headers => auth_header

       end
       assert_response :not_found
 
       hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 
       assert_no_difference "NoteComment.count" do
       end
       assert_response :not_found
 
       hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 
       assert_no_difference "NoteComment.count" do

-        post comment_api_note_path(:id => hidden_note_with_comment, :text => "This is an additional comment"), :headers => auth_header
+        post comment_api_note_path(hidden_note_with_comment, :text => "This is an additional comment"), :headers => auth_header

       end
       assert_response :gone
 
       end
       assert_response :gone
 

-      closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc)
+      closed_note_with_comment = create(:note_with_comments, :closed)

 
       assert_no_difference "NoteComment.count" do
 
       assert_no_difference "NoteComment.count" do

-        post comment_api_note_path(:id => closed_note_with_comment, :text => "This is an additional comment"), :headers => auth_header
+        post comment_api_note_path(closed_note_with_comment, :text => "This is an additional comment"), :headers => auth_header

       end
       assert_response :conflict
 
       assert_no_difference "NoteComment.count" do
       end
       assert_response :conflict
 
       assert_no_difference "NoteComment.count" do

-        post comment_api_note_path(:id => open_note_with_comment, :text => "x\u0000y"), :headers => auth_header
+        post comment_api_note_path(open_note_with_comment, :text => "x\u0000y"), :headers => auth_header

       end
       assert_response :bad_request
     end
       end
       assert_response :bad_request
     end


@@ -362,12 +422,14 @@ module Api
       open_note_with_comment = create(:note_with_comments)
       user = create(:user)
 
       open_note_with_comment = create(:note_with_comments)
       user = create(:user)
 

-      post close_api_note_path(:id => open_note_with_comment, :text => "This is a close comment", :format => "json")
+      post close_api_note_path(open_note_with_comment, :text => "This is a close comment", :format => "json")

       assert_response :unauthorized
 
       assert_response :unauthorized
 

-      auth_header = basic_authorization_header user.email, "test"
+      auth_header = bearer_authorization_header user

 
 

-      post close_api_note_path(:id => open_note_with_comment, :text => "This is a close comment", :format => "json"), :headers => auth_header
+      assert_difference "NoteSubscription.count", 1 do
+        post close_api_note_path(open_note_with_comment, :text => "This is a close comment", :format => "json"), :headers => auth_header
+      end

       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


@@ -379,7 +441,11 @@ module Api
       assert_equal "This is a close comment", js["properties"]["comments"].last["text"]
       assert_equal user.display_name, js["properties"]["comments"].last["user"]
 
       assert_equal "This is a close comment", js["properties"]["comments"].last["text"]
       assert_equal user.display_name, js["properties"]["comments"].last["user"]
 

-      get api_note_path(:id => open_note_with_comment.id, :format => "json")
+      subscription = NoteSubscription.last
+      assert_equal user, subscription.user
+      assert_equal open_note_with_comment, subscription.note
+
+      get api_note_path(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


@@ -393,54 +459,60 @@ module Api
     end
 
     def test_close_fail
     end
 
     def test_close_fail

-      post close_api_note_path(:id => 12345)
+      post close_api_note_path(12345)

       assert_response :unauthorized
 
       assert_response :unauthorized
 

-      auth_header = basic_authorization_header create(:user).email, "test"
+      auth_header = bearer_authorization_header

 
 

-      post close_api_note_path(:id => 12345), :headers => auth_header
+      post close_api_note_path(12345), :headers => auth_header

       assert_response :not_found
 
       hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 
       assert_response :not_found
 
       hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 

-      post close_api_note_path(:id => hidden_note_with_comment), :headers => auth_header
+      post close_api_note_path(hidden_note_with_comment), :headers => auth_header

       assert_response :gone
 
       assert_response :gone
 

-      closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc)
+      closed_note_with_comment = create(:note_with_comments, :closed)

 
 

-      post close_api_note_path(:id => closed_note_with_comment), :headers => auth_header
+      post close_api_note_path(closed_note_with_comment), :headers => auth_header

       assert_response :conflict
     end
 
     def test_reopen_success
       assert_response :conflict
     end
 
     def test_reopen_success

-      closed_note_with_comment = create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc)
+      closed_note_with_comment = create(:note_with_comments, :closed)

       user = create(:user)
 
       user = create(:user)
 

-      post reopen_api_note_path(:id => closed_note_with_comment, :text => "This is a reopen comment", :format => "json")
+      post reopen_api_note_path(closed_note_with_comment, :text => "This is a reopen comment", :format => "json")

       assert_response :unauthorized
 
       assert_response :unauthorized
 

-      auth_header = basic_authorization_header user.email, "test"
+      auth_header = bearer_authorization_header user

 
 

-      post reopen_api_note_path(:id => closed_note_with_comment, :text => "This is a reopen comment", :format => "json"), :headers => auth_header
+      assert_difference "NoteSubscription.count", 1 do
+        post reopen_api_note_path(closed_note_with_comment, :text => "This is a reopen comment", :format => "json"), :headers => auth_header
+      end

       assert_response :success
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "Feature", js["type"]
       assert_equal closed_note_with_comment.id, js["properties"]["id"]
       assert_equal "open", js["properties"]["status"]
       assert_response :success
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "Feature", js["type"]
       assert_equal closed_note_with_comment.id, js["properties"]["id"]
       assert_equal "open", js["properties"]["status"]

-      assert_equal 2, js["properties"]["comments"].count
+      assert_equal 3, js["properties"]["comments"].count

       assert_equal "reopened", js["properties"]["comments"].last["action"]
       assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"]
       assert_equal user.display_name, js["properties"]["comments"].last["user"]
 
       assert_equal "reopened", js["properties"]["comments"].last["action"]
       assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"]
       assert_equal user.display_name, js["properties"]["comments"].last["user"]
 

-      get api_note_path(:id => closed_note_with_comment, :format => "json")
+      subscription = NoteSubscription.last
+      assert_equal user, subscription.user
+      assert_equal closed_note_with_comment, subscription.note
+
+      get api_note_path(closed_note_with_comment, :format => "json")

       assert_response :success
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "Feature", js["type"]
       assert_equal closed_note_with_comment.id, js["properties"]["id"]
       assert_equal "open", js["properties"]["status"]
       assert_response :success
       js = ActiveSupport::JSON.decode(@response.body)
       assert_not_nil js
       assert_equal "Feature", js["type"]
       assert_equal closed_note_with_comment.id, js["properties"]["id"]
       assert_equal "open", js["properties"]["status"]

-      assert_equal 2, js["properties"]["comments"].count
+      assert_equal 3, js["properties"]["comments"].count

       assert_equal "reopened", js["properties"]["comments"].last["action"]
       assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"]
       assert_equal user.display_name, js["properties"]["comments"].last["user"]
       assert_equal "reopened", js["properties"]["comments"].last["action"]
       assert_equal "This is a reopen comment", js["properties"]["comments"].last["text"]
       assert_equal user.display_name, js["properties"]["comments"].last["user"]


@@ -449,27 +521,27 @@ module Api
     def test_reopen_fail
       hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 
     def test_reopen_fail
       hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 

-      post reopen_api_note_path(:id => hidden_note_with_comment)
+      post reopen_api_note_path(hidden_note_with_comment)

       assert_response :unauthorized
 
       assert_response :unauthorized
 

-      auth_header = basic_authorization_header create(:user).email, "test"
+      auth_header = bearer_authorization_header

 
 

-      post reopen_api_note_path(:id => 12345), :headers => auth_header
+      post reopen_api_note_path(12345), :headers => auth_header

       assert_response :not_found
 
       assert_response :not_found
 

-      post reopen_api_note_path(:id => hidden_note_with_comment), :headers => auth_header
+      post reopen_api_note_path(hidden_note_with_comment), :headers => auth_header

       assert_response :gone
 
       open_note_with_comment = create(:note_with_comments)
 
       assert_response :gone
 
       open_note_with_comment = create(:note_with_comments)
 

-      post reopen_api_note_path(:id => open_note_with_comment), :headers => auth_header
+      post reopen_api_note_path(open_note_with_comment), :headers => auth_header

       assert_response :conflict
     end
 
     def test_show_success
       open_note = create(:note_with_comments)
 
       assert_response :conflict
     end
 
     def test_show_success
       open_note = create(:note_with_comments)
 

-      get api_note_path(:id => open_note, :format => "xml")
+      get api_note_path(open_note, :format => "xml")

       assert_response :success
       assert_equal "application/xml", @response.media_type
       assert_select "osm", :count => 1 do
       assert_response :success
       assert_equal "application/xml", @response.media_type
       assert_select "osm", :count => 1 do


@@ -486,7 +558,7 @@ module Api
         end
       end
 
         end
       end
 

-      get api_note_path(:id => open_note, :format => "rss")
+      get api_note_path(open_note, :format => "rss")

       assert_response :success
       assert_equal "application/rss+xml", @response.media_type
       assert_select "rss", :count => 1 do
       assert_response :success
       assert_equal "application/rss+xml", @response.media_type
       assert_select "rss", :count => 1 do


@@ -502,7 +574,7 @@ module Api
         end
       end
 
         end
       end
 

-      get api_note_path(:id => open_note, :format => "json")
+      get api_note_path(open_note, :format => "json")

       assert_response :success
       assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)
       assert_response :success
       assert_equal "application/json", @response.media_type
       js = ActiveSupport::JSON.decode(@response.body)


@@ -518,7 +590,7 @@ module Api
       assert_equal open_note.created_at.to_s, js["properties"]["date_created"]
       assert_equal open_note.status, js["properties"]["status"]
 
       assert_equal open_note.created_at.to_s, js["properties"]["date_created"]
       assert_equal open_note.status, js["properties"]["status"]
 

-      get api_note_path(:id => open_note, :format => "gpx")
+      get api_note_path(open_note, :format => "gpx")

       assert_response :success
       assert_equal "application/gpx+xml", @response.media_type
       assert_select "gpx", :count => 1 do
       assert_response :success
       assert_equal "application/gpx+xml", @response.media_type
       assert_select "gpx", :count => 1 do


@@ -544,7 +616,7 @@ module Api
         create(:note_comment, :note => note, :body => "Another valid comment for hidden note")
       end
 
         create(:note_comment, :note => note, :body => "Another valid comment for hidden note")
       end
 

-      get api_note_path(:id => note_with_hidden_comment, :format => "json")
+      get api_note_path(note_with_hidden_comment, :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


@@ -556,10 +628,10 @@ module Api
     end
 
     def test_show_fail
     end
 
     def test_show_fail

-      get api_note_path(:id => 12345)
+      get api_note_path(12345)

       assert_response :not_found
 
       assert_response :not_found
 

-      get api_note_path(:id => create(:note, :status => "hidden"))
+      get api_note_path(create(:note, :status => "hidden"))

       assert_response :gone
     end
 
       assert_response :gone
     end
 


@@ -568,17 +640,17 @@ module Api
       user = create(:user)
       moderator_user = create(:moderator_user)
 
       user = create(:user)
       moderator_user = create(:moderator_user)
 

-      delete api_note_path(:id => open_note_with_comment, :text => "This is a hide comment", :format => "json")
+      delete api_note_path(open_note_with_comment, :text => "This is a hide comment", :format => "json")

       assert_response :unauthorized
 
       assert_response :unauthorized
 

-      auth_header = basic_authorization_header user.email, "test"
+      auth_header = bearer_authorization_header user

 
 

-      delete api_note_path(:id => open_note_with_comment, :text => "This is a hide comment", :format => "json"), :headers => auth_header
+      delete api_note_path(open_note_with_comment, :text => "This is a hide comment", :format => "json"), :headers => auth_header

       assert_response :forbidden
 
       assert_response :forbidden
 

-      auth_header = basic_authorization_header moderator_user.email, "test"
+      auth_header = bearer_authorization_header moderator_user

 
 

-      delete api_note_path(:id => open_note_with_comment, :text => "This is a hide comment", :format => "json"), :headers => auth_header
+      delete api_note_path(open_note_with_comment, :text => "This is a hide comment", :format => "json"), :headers => auth_header

       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


@@ -590,12 +662,12 @@ module Api
       assert_equal "This is a hide comment", js["properties"]["comments"].last["text"]
       assert_equal moderator_user.display_name, js["properties"]["comments"].last["user"]
 
       assert_equal "This is a hide comment", js["properties"]["comments"].last["text"]
       assert_equal moderator_user.display_name, js["properties"]["comments"].last["user"]
 

-      get api_note_path(:id => open_note_with_comment, :format => "json"), :headers => auth_header
+      get api_note_path(open_note_with_comment, :format => "json"), :headers => auth_header

       assert_response :success
 
       assert_response :success
 

-      auth_header = basic_authorization_header user.email, "test"
+      auth_header = bearer_authorization_header user

 
 

-      get api_note_path(:id => open_note_with_comment, :format => "json"), :headers => auth_header
+      get api_note_path(open_note_with_comment, :format => "json"), :headers => auth_header

       assert_response :gone
     end
 
       assert_response :gone
     end
 


@@ -603,22 +675,22 @@ module Api
       user = create(:user)
       moderator_user = create(:moderator_user)
 
       user = create(:user)
       moderator_user = create(:moderator_user)
 

-      delete api_note_path(:id => 12345, :format => "json")
+      delete api_note_path(12345, :format => "json")

       assert_response :unauthorized
 
       assert_response :unauthorized
 

-      auth_header = basic_authorization_header user.email, "test"
+      auth_header = bearer_authorization_header user

 
 

-      delete api_note_path(:id => 12345, :format => "json"), :headers => auth_header
+      delete api_note_path(12345, :format => "json"), :headers => auth_header

       assert_response :forbidden
 
       assert_response :forbidden
 

-      auth_header = basic_authorization_header moderator_user.email, "test"
+      auth_header = bearer_authorization_header moderator_user

 
 

-      delete api_note_path(:id => 12345, :format => "json"), :headers => auth_header
+      delete api_note_path(12345, :format => "json"), :headers => auth_header

       assert_response :not_found
 
       hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 
       assert_response :not_found
 
       hidden_note_with_comment = create(:note_with_comments, :status => "hidden")
 

-      delete api_note_path(:id => hidden_note_with_comment, :format => "json"), :headers => auth_header
+      delete api_note_path(hidden_note_with_comment, :format => "json"), :headers => auth_header

       assert_response :gone
     end
 
       assert_response :gone
     end
 


@@ -752,8 +824,8 @@ module Api
     end
 
     def test_index_closed
     end
 
     def test_index_closed

-      create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc - 5.days)
-      create(:note_with_comments, :status => "closed", :closed_at => Time.now.utc - 100.days)
+      create(:note_with_comments, :closed, :closed_at => Time.now.utc - 5.days)
+      create(:note_with_comments, :closed, :closed_at => Time.now.utc - 100.days)

       create(:note_with_comments, :status => "hidden")
       create(:note_with_comments)
 
       create(:note_with_comments, :status => "hidden")
       create(:note_with_comments)
 


@@ -786,6 +858,10 @@ module Api
     end
 
     def test_index_bad_params
     end
 
     def test_index_bad_params

+      get api_notes_path
+      assert_response :bad_request
+      assert_equal "The parameter bbox is required", @response.body
+

       get api_notes_path(:bbox => "-2.5,-2.5,2.5")
       assert_response :bad_request
 
       get api_notes_path(:bbox => "-2.5,-2.5,2.5")
       assert_response :bad_request