aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test
diff options
context:
space:
mode:
authorTimm <kaspth@gmail.com>2013-10-11 13:12:30 +0200
committerTimm <kaspth@gmail.com>2014-06-16 21:04:18 +0200
commit93f2cd864576aae37e847886b02e0d3bd2d1dfc3 (patch)
tree68f6133bac998ec224b150ee5128798b57a67031 /actionview/test
parent72ce9a49cbe3ffccae647d7f51a568f43aac85b9 (diff)
downloadrails-93f2cd864576aae37e847886b02e0d3bd2d1dfc3.tar.gz
rails-93f2cd864576aae37e847886b02e0d3bd2d1dfc3.tar.bz2
rails-93f2cd864576aae37e847886b02e0d3bd2d1dfc3.zip
Included DomAssertions in url_helper- and atom_feed_helper_test.rb.
Diffstat (limited to 'actionview/test')
-rw-r--r--actionview/test/template/atom_feed_helper_test.rb2
-rw-r--r--actionview/test/template/url_helper_test.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/actionview/test/template/atom_feed_helper_test.rb b/actionview/test/template/atom_feed_helper_test.rb
index a2d6b81aad..9d306310ea 100644
--- a/actionview/test/template/atom_feed_helper_test.rb
+++ b/actionview/test/template/atom_feed_helper_test.rb
@@ -207,6 +207,8 @@ end
class AtomFeedTest < ActionController::TestCase
tests ScrollsController
+ include Rails::Dom::Testing::Assertions::SelectorAssertions
+
def setup
super
@request.host = "www.nextangle.com"
diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb
index f04532c77c..e0678ae1f7 100644
--- a/actionview/test/template/url_helper_test.rb
+++ b/actionview/test/template/url_helper_test.rb
@@ -25,7 +25,7 @@ class UrlHelperTest < ActiveSupport::TestCase
include routes.url_helpers
include ActionView::Helpers::JavaScriptHelper
- include ActionView::Assertions::DomAssertions
+ include Rails::Dom::Testing::Assertions::DomAssertions
include ActionView::Context
include RenderERBUtils