diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2016-08-17 17:56:23 +0200 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2016-08-17 17:58:00 +0200 |
commit | 10ba09f5466fe3d34a5ed78202c35f4e4f9d30e6 (patch) | |
tree | ed1a2f603198053a6872d3ac74ee69ba4990fdf3 /spec/controllers/api | |
parent | ff2cbc07530d87132af09900b4d0c9ada9d3e716 (diff) |
Upgrade to Rails 5.0.0.1
Diffstat (limited to 'spec/controllers/api')
6 files changed, 12 insertions, 12 deletions
diff --git a/spec/controllers/api/accounts/lookup_controller_spec.rb b/spec/controllers/api/accounts/lookup_controller_spec.rb index 46c904b5a..043df8c86 100644 --- a/spec/controllers/api/accounts/lookup_controller_spec.rb +++ b/spec/controllers/api/accounts/lookup_controller_spec.rb @@ -12,7 +12,7 @@ RSpec.describe Api::Accounts::LookupController, type: :controller do before do Fabricate(:account, username: 'bob') Fabricate(:account, username: 'mcbeth') - get :index, usernames: 'alice,bob,mcbeth' + get :index, params: { usernames: 'alice,bob,mcbeth' } end it 'returns http success' do diff --git a/spec/controllers/api/accounts_controller_spec.rb b/spec/controllers/api/accounts_controller_spec.rb index 7bcb1a788..dd060ddaa 100644 --- a/spec/controllers/api/accounts_controller_spec.rb +++ b/spec/controllers/api/accounts_controller_spec.rb @@ -10,28 +10,28 @@ RSpec.describe Api::AccountsController, type: :controller do describe 'GET #show' do it 'returns http success' do - get :show, id: user.account.id + get :show, params: { id: user.account.id } expect(response).to have_http_status(:success) end end describe 'GET #statuses' do it 'returns http success' do - get :statuses, id: user.account.id + get :statuses, params: { id: user.account.id } expect(response).to have_http_status(:success) end end describe 'GET #followers' do it 'returns http success' do - get :followers, id: user.account.id + get :followers, params: { id: user.account.id } expect(response).to have_http_status(:success) end end describe 'GET #following' do it 'returns http success' do - get :following, id: user.account.id + get :following, params: { id: user.account.id } expect(response).to have_http_status(:success) end end @@ -40,7 +40,7 @@ RSpec.describe Api::AccountsController, type: :controller do let(:other_account) { Fabricate(:account, username: 'bob') } before do - post :follow, id: other_account.id + post :follow, params: { id: other_account.id } end it 'returns http success' do @@ -57,7 +57,7 @@ RSpec.describe Api::AccountsController, type: :controller do before do user.account.follow!(other_account) - post :unfollow, id: other_account.id + post :unfollow, params: { id: other_account.id } end it 'returns http success' do diff --git a/spec/controllers/api/follows_controller_spec.rb b/spec/controllers/api/follows_controller_spec.rb index e9bb1bfa5..286465251 100644 --- a/spec/controllers/api/follows_controller_spec.rb +++ b/spec/controllers/api/follows_controller_spec.rb @@ -18,7 +18,7 @@ RSpec.describe Api::FollowsController, type: :controller do stub_request(:post, "https://quitter.no/main/salmon/user/7477").to_return(:status => 200, :body => "", :headers => {}) stub_request(:post, "https://pubsubhubbub.superfeedr.com/").to_return(:status => 200, :body => "", :headers => {}) - post :create, uri: 'gargron@quitter.no' + post :create, params: { uri: 'gargron@quitter.no' } end it 'returns http success' do diff --git a/spec/controllers/api/salmon_controller_spec.rb b/spec/controllers/api/salmon_controller_spec.rb index d5be69c01..8b356640f 100644 --- a/spec/controllers/api/salmon_controller_spec.rb +++ b/spec/controllers/api/salmon_controller_spec.rb @@ -13,7 +13,7 @@ RSpec.describe Api::SalmonController, type: :controller do describe 'POST #update' do before do request.env['RAW_POST_DATA'] = File.read(File.join(Rails.root, 'spec', 'fixtures', 'salmon', 'mention.xml')) - post :update, id: account.id + post :update, params: { id: account.id } end it 'returns http success' do diff --git a/spec/controllers/api/statuses_controller_spec.rb b/spec/controllers/api/statuses_controller_spec.rb index 75a8b999a..c02c1d889 100644 --- a/spec/controllers/api/statuses_controller_spec.rb +++ b/spec/controllers/api/statuses_controller_spec.rb @@ -12,7 +12,7 @@ RSpec.describe Api::StatusesController, type: :controller do let(:status) { Fabricate(:status, account: user.account) } it 'returns http success' do - get :show, id: status.id + get :show, params: { id: status.id } expect(response).to have_http_status(:success) end end diff --git a/spec/controllers/api/subscriptions_controller_spec.rb b/spec/controllers/api/subscriptions_controller_spec.rb index de4c8f56d..e13ec4939 100644 --- a/spec/controllers/api/subscriptions_controller_spec.rb +++ b/spec/controllers/api/subscriptions_controller_spec.rb @@ -5,7 +5,7 @@ RSpec.describe Api::SubscriptionsController, type: :controller do describe 'GET #show' do before do - get :show, :id => account.id, 'hub.topic' => 'topic_url', 'hub.verify_token' => 123, 'hub.challenge' => '456' + get :show, params: { :id => account.id, 'hub.topic' => 'topic_url', 'hub.verify_token' => 123, 'hub.challenge' => '456' } end it 'returns http success' do @@ -26,7 +26,7 @@ RSpec.describe Api::SubscriptionsController, type: :controller do request.env['HTTP_X_HUB_SIGNATURE'] = "sha1=#{OpenSSL::HMAC.hexdigest('sha1', 'abc', feed)}" request.env['RAW_POST_DATA'] = feed - post :update, id: account.id + post :update, params: { id: account.id } end it 'returns http created' do |