github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-25 19:29:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Uncaught promise on link click; fixes broken build

Browse Source
This commit is contained in:
Robin Ward
2014-01-09 16:31:26 -05:00
parent af9b7bfee2
commit ca26d6d0d6
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/lib/click_track.js
View File

@ -77,7 +77,8 @@ Discourse.ClickTrack = {
post_id: postId, post_id: postId,
topic_id: topicId, topic_id: topicId,
redirect: false redirect: false
} },
dataType: 'html'
}); });
window.open(href, '_blank'); window.open(href, '_blank');
return false; return false;
@ -91,7 +92,8 @@ Discourse.ClickTrack = {
post_id: postId, post_id: postId,
topic_id: topicId, topic_id: topicId,
redirect: false redirect: false
} },
dataType: 'html'
}); });
Discourse.URL.routeTo(href); Discourse.URL.routeTo(href);
return false; return false;

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

@ -43,7 +43,9 @@ describe Admin::EmailController do
context 'with an email address' do context 'with an email address' do
it 'enqueues a test email job' do it 'enqueues a test email job' do
Jobs.expects(:enqueue).with(:test_email, to_address: 'eviltrout@test.domain') 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' xhr :post, :test, email_address: 'eviltrout@test.domain'
end end
end end