github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix all the errors to get our tests green on Rails 5.1.

Browse Source
This commit is contained in:
Guo Xiang Tan
2017-08-31 12:06:56 +08:00
parent 898ee93547
commit 77d4c4d8dc
989 changed files with 5114 additions and 3117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
spec/controllers/admin/email_controller_spec.rb
View File

@ -10,10 +10,14 @@ describe Admin::EmailController do
context '.index' do
before do
subject.expects(:action_mailer_settings).returns(username: 'username',
password: 'secret')
subject
.expects(:action_mailer_settings)
.returns(
username: 'username',
password: 'secret'
)
xhr :get, :index
get :index, format: :json
end
it 'does not include the password in the response' do
@ -27,7 +31,7 @@ describe Admin::EmailController do
context '.sent' do
before do
xhr :get, :sent
get :sent, format: :json
end
subject { response }
@ -36,7 +40,7 @@ describe Admin::EmailController do
context '.skipped' do
before do
xhr :get, :skipped
get :skipped, format: :json
end
subject { response }
@ -45,7 +49,9 @@ describe Admin::EmailController do
context '.test' do
it 'raises an error without the email parameter' do
expect { xhr :post, :test }.to raise_error(ActionController::ParameterMissing)
expect do
post :test, format: :json
end.to raise_error(ActionController::ParameterMissing)
end
context 'with an email address' do
@ -53,18 +59,23 @@ describe Admin::EmailController do
job_mock = mock
Jobs::TestEmail.expects(:new).returns(job_mock)
job_mock.expects(:execute).with(to_address: 'eviltrout@test.domain')
xhr :post, :test, email_address: 'eviltrout@test.domain'
post :test, params: { email_address: 'eviltrout@test.domain' }, format: :json
end
end
end
context '.preview_digest' do
it 'raises an error without the last_seen_at parameter' do
expect { xhr :get, :preview_digest }.to raise_error(ActionController::ParameterMissing)
expect do
get :preview_digest, format: :json
end.to raise_error(ActionController::ParameterMissing)
end
it "previews the digest" do
xhr :get, :preview_digest, last_seen_at: 1.week.ago, username: user.username
get :preview_digest, params: {
last_seen_at: 1.week.ago, username: user.username
}, format: :json
expect(response).to be_success
end
end
@ -76,7 +87,7 @@ describe Admin::EmailController do
end
it 'should enqueue the right job' do
expect { xhr :post, :handle_mail, email: email('cc') }
expect { post :handle_mail, params: { email: email('cc') }, format: :json }
.to change { Jobs::ProcessEmail.jobs.count }.by(1)
end
end
@ -84,7 +95,7 @@ describe Admin::EmailController do
context '.rejected' do
it 'should provide a string for a blank error' do
Fabricate(:incoming_email, error: "")
xhr :get, :rejected
get :rejected, format: :json
rejected = JSON.parse(response.body)
expect(rejected.first['error']).to eq(I18n.t("emails.incoming.unrecognized_error"))
end
@ -93,7 +104,7 @@ describe Admin::EmailController do
context '.incoming' do
it 'should provide a string for a blank error' do
incoming_email = Fabricate(:incoming_email, error: "")
xhr :get, :incoming, id: incoming_email.id
get :incoming, params: { id: incoming_email.id }, format: :json
incoming = JSON.parse(response.body)
expect(incoming['error']).to eq(I18n.t("emails.incoming.unrecognized_error"))
end