aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/assert_select_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/controller/assert_select_test.rb')
-rw-r--r--actionpack/test/controller/assert_select_test.rb13
1 files changed, 3 insertions, 10 deletions
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
index 38598a520c..114bbf3c22 100644
--- a/actionpack/test/controller/assert_select_test.rb
+++ b/actionpack/test/controller/assert_select_test.rb
@@ -8,17 +8,10 @@ require 'abstract_unit'
require 'controller/fake_controllers'
require 'action_mailer'
-ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH
+require 'action_view'
-class SynchronousQueue < Queue
- def push(job)
- job.run
- end
- alias << push
- alias enq push
-end
-
-ActionMailer::Base.queue = SynchronousQueue.new
+ActionMailer::Base.send(:include, ActionView::Layouts)
+ActionMailer::Base.view_paths = FIXTURE_LOAD_PATH
class AssertSelectTest < ActionController::TestCase
Assertion = ActiveSupport::TestCase::Assertion