mastofe

commit: 948dd26931f450d42322c32a3eb9d97eccb69d4d
parent: 55e1e12b7d673aece3cf015360af9fb4252dd7e5
Author: Matt Jankowski <mjankowski@thoughtbot.com>
Date:   Sun, 23 Apr 2017 13:10:04 -0400

Fix deprecation warnings on activitypub controller specs (#2357)


Diffstat:
M
spec/controllers/api/activitypub/activities_controller_spec.rb
4
++--
M
spec/controllers/api/activitypub/notes_controller_spec.rb
4
++--
M
spec/controllers/api/activitypub/outbox_controller_spec.rb
4
++--

3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/spec/controllers/api/activitypub/activities_controller_spec.rb b/spec/controllers/api/activitypub/activities_controller_spec.rb
@@ -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
diff --git a/spec/controllers/api/activitypub/notes_controller_spec.rb b/spec/controllers/api/activitypub/notes_controller_spec.rb
@@ -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
diff --git a/spec/controllers/api/activitypub/outbox_controller_spec.rb b/spec/controllers/api/activitypub/outbox_controller_spec.rb
@@ -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