Drop support for basic authentication

[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 045e3bf434fe8b6dc36054379e5a4561c7f2fc63..ed410e8c75b7f51ba83eeb5d1f1bf062d3f40b97 100644 (file)
--- a/test/controllers/api/notes_controller_test.rb
+++ b/test/controllers/api/notes_controller_test.rb
@@ -99,27 +99,6 @@ 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
 
     def test_create_success
     end
 
     def test_create_success


@@ -224,7 +203,7 @@ module Api
     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_no_difference "ActionMailer::Base.deliveries.size" do
           perform_enqueued_jobs do
       assert_difference "NoteComment.count", 1 do
         assert_no_difference "ActionMailer::Base.deliveries.size" do
           perform_enqueued_jobs do


@@ -265,7 +244,7 @@ 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 "ActionMailer::Base.deliveries.size", 2 do
 
       assert_difference "NoteComment.count", 1 do
         assert_difference "ActionMailer::Base.deliveries.size", 2 do


@@ -321,7 +300,7 @@ module Api
         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
         post comment_api_note_path(open_note_with_comment), :headers => auth_header
 
       assert_no_difference "NoteComment.count" do
         post comment_api_note_path(open_note_with_comment), :headers => auth_header


@@ -365,7 +344,7 @@ module Api
       post close_api_note_path(open_note_with_comment, :text => "This is a close comment", :format => "json")
       assert_response :unauthorized
 
       post close_api_note_path(open_note_with_comment, :text => "This is a close comment", :format => "json")
       assert_response :unauthorized
 

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

 
       post close_api_note_path(open_note_with_comment, :text => "This is a close comment", :format => "json"), :headers => auth_header
       assert_response :success
 
       post close_api_note_path(open_note_with_comment, :text => "This is a close comment", :format => "json"), :headers => auth_header
       assert_response :success


@@ -396,7 +375,7 @@ module Api
       post close_api_note_path(12345)
       assert_response :unauthorized
 
       post close_api_note_path(12345)
       assert_response :unauthorized
 

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

 
       post close_api_note_path(12345), :headers => auth_header
       assert_response :not_found
 
       post close_api_note_path(12345), :headers => auth_header
       assert_response :not_found


@@ -419,7 +398,7 @@ module Api
       post reopen_api_note_path(closed_note_with_comment, :text => "This is a reopen comment", :format => "json")
       assert_response :unauthorized
 
       post reopen_api_note_path(closed_note_with_comment, :text => "This is a reopen comment", :format => "json")
       assert_response :unauthorized
 

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

 
       post reopen_api_note_path(closed_note_with_comment, :text => "This is a reopen comment", :format => "json"), :headers => auth_header
       assert_response :success
 
       post reopen_api_note_path(closed_note_with_comment, :text => "This is a reopen comment", :format => "json"), :headers => auth_header
       assert_response :success


@@ -452,7 +431,7 @@ module Api
       post reopen_api_note_path(hidden_note_with_comment)
       assert_response :unauthorized
 
       post reopen_api_note_path(hidden_note_with_comment)
       assert_response :unauthorized
 

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

 
       post reopen_api_note_path(12345), :headers => auth_header
       assert_response :not_found
 
       post reopen_api_note_path(12345), :headers => auth_header
       assert_response :not_found


@@ -571,12 +550,12 @@ module Api
       delete api_note_path(open_note_with_comment, :text => "This is a hide comment", :format => "json")
       assert_response :unauthorized
 
       delete api_note_path(open_note_with_comment, :text => "This is a hide comment", :format => "json")
       assert_response :unauthorized
 

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

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

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

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


@@ -593,7 +572,7 @@ module Api
       get api_note_path(open_note_with_comment, :format => "json"), :headers => auth_header
       assert_response :success
 
       get api_note_path(open_note_with_comment, :format => "json"), :headers => auth_header
       assert_response :success
 

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

 
       get api_note_path(open_note_with_comment, :format => "json"), :headers => auth_header
       assert_response :gone
 
       get api_note_path(open_note_with_comment, :format => "json"), :headers => auth_header
       assert_response :gone


@@ -606,12 +585,12 @@ module Api
       delete api_note_path(12345, :format => "json")
       assert_response :unauthorized
 
       delete api_note_path(12345, :format => "json")
       assert_response :unauthorized
 

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

 
       delete api_note_path(12345, :format => "json"), :headers => auth_header
       assert_response :forbidden
 
 
       delete api_note_path(12345, :format => "json"), :headers => auth_header
       assert_response :forbidden
 

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

 
       delete api_note_path(12345, :format => "json"), :headers => auth_header
       assert_response :not_found
 
       delete api_note_path(12345, :format => "json"), :headers => auth_header
       assert_response :not_found