]> cat aescling's git repositories - mastodon.git/commitdiff
Fix deprecation warnings on activitypub controller specs (#2357)
authorMatt Jankowski <mjankowski@thoughtbot.com>
Sun, 23 Apr 2017 17:10:04 +0000 (13:10 -0400)
committerEugen <eugen@zeonfederated.com>
Sun, 23 Apr 2017 17:10:04 +0000 (19:10 +0200)
spec/controllers/api/activitypub/activities_controller_spec.rb
spec/controllers/api/activitypub/notes_controller_spec.rb
spec/controllers/api/activitypub/outbox_controller_spec.rb

index c78c93a753983cae9f3205948cf8cf2c24d7817a..2de53028968052971d1da2857e143eb5f85baf4b 100644 (file)
@@ -13,7 +13,7 @@ RSpec.describe Api::Activitypub::ActivitiesController, type: :controller do
         public_status = Status.create!(account: user.account, text: 'Hello world', visibility: :public)
 
         @request.env['HTTP_ACCEPT'] = 'application/activity+json'
-        get :show_status, id: public_status.id
+        get :show_status, params: { id: public_status.id }
       end
 
       it 'returns http success' do
@@ -48,7 +48,7 @@ RSpec.describe Api::Activitypub::ActivitiesController, type: :controller do
         reblog = Status.create!(account: user.account, reblog_of_id: original.id, visibility: :public)
 
         @request.env['HTTP_ACCEPT'] = 'application/activity+json'
-        get :show_status, id: reblog.id
+        get :show_status, params: { id: reblog.id }
       end
 
       it 'returns http success' do
index df8f1b42a8dc9c39b075b5581fbbc3b07a4c4d7a..8b8db2fecf3423020c06cfa98e9d127ba6ad75f2 100644 (file)
@@ -14,7 +14,7 @@ RSpec.describe Api::Activitypub::NotesController, type: :controller do
         public_status = Status.create!(account: user_alice.account, text: 'Hello world', visibility: :public)
 
         @request.env['HTTP_ACCEPT'] = 'application/activity+json'
-        get :show, id: public_status.id
+        get :show, params: { id: public_status.id }
       end
 
       it 'returns http success' do
@@ -50,7 +50,7 @@ RSpec.describe Api::Activitypub::NotesController, type: :controller do
         reply = Status.create!(account: user_bob.account, text: 'Hello world', in_reply_to_id: original.id, visibility: :public)
 
         @request.env['HTTP_ACCEPT'] = 'application/activity+json'
-        get :show, id: reply.id
+        get :show, params: { id: reply.id }
       end
 
       it 'returns http success' do
index 55fb9b509f047769a0603f6aca0cb2a60de7e7a5..9a47dde6bfcaea19ddf8cf6c897e609d8d005f88 100644 (file)
@@ -19,7 +19,7 @@ RSpec.describe Api::Activitypub::OutboxController, type: :controller do
         Status.create!(account: user.account, text: 'Hello world', visibility: :unlisted)
         Status.create!(account: user.account, text: 'Hello world', visibility: :direct)
 
-        get :show, id: user.account.id
+        get :show, params: { id: user.account.id }
       end
 
       it 'returns http success' do
@@ -59,7 +59,7 @@ RSpec.describe Api::Activitypub::OutboxController, type: :controller do
 
       describe 'first page' do
         before do
-          get :show, id: user.account.id
+          get :show, params: { id: user.account.id }
         end
 
         it 'returns http success' do