From ca26d6d0d65a1ae0bb890aa6d11545e49c348189 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 9 Jan 2014 16:31:26 -0500 Subject: [PATCH] FIX: Uncaught promise on link click; fixes broken build --- app/assets/javascripts/discourse/lib/click_track.js | 6 ++++-- spec/controllers/admin/email_controller_spec.rb | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/click_track.js b/app/assets/javascripts/discourse/lib/click_track.js index 50611cf5374..84b3e0983d8 100644 --- a/app/assets/javascripts/discourse/lib/click_track.js +++ b/app/assets/javascripts/discourse/lib/click_track.js @@ -77,7 +77,8 @@ Discourse.ClickTrack = { post_id: postId, topic_id: topicId, redirect: false - } + }, + dataType: 'html' }); window.open(href, '_blank'); return false; @@ -91,7 +92,8 @@ Discourse.ClickTrack = { post_id: postId, topic_id: topicId, redirect: false - } + }, + dataType: 'html' }); Discourse.URL.routeTo(href); return false; diff --git a/spec/controllers/admin/email_controller_spec.rb b/spec/controllers/admin/email_controller_spec.rb index 5314f1d29e8..38ae61e6030 100644 --- a/spec/controllers/admin/email_controller_spec.rb +++ b/spec/controllers/admin/email_controller_spec.rb @@ -43,7 +43,9 @@ describe Admin::EmailController do context 'with an email address' 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' end end