Skip to content

Commit 5fbf78d

Browse files
joshjosh
committed
Merge pull request #203 from rails/assert-dom-equal
Use assert_dom_equal
2 parents a9620ef + 3e156bc commit 5fbf78d

File tree

2 files changed

+61
-58
lines changed

2 files changed

+61
-58
lines changed

‎Rakefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ require 'rake/testtask'
33
task :default => :test
44

55
task :test_legacy do
6-
exec "testrb test/test_*.rb"
6+
Dir['test/test_*.rb'].each do |path|
7+
system "testrb", path
8+
exit($?.exitstatus) unless $?.success?
9+
end
710
end
811

912
Rake::TestTask.new(:test) do |t|

‎test/test_helper.rb

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
Minitest::Test = MiniTest::Unit::TestCase unless defined?(Minitest::Test)
88

9-
class HelperTest < Minitest::Test
9+
class HelperTest < ActionView::TestCase
1010
FIXTURES_PATH = File.expand_path("../fixtures", __FILE__)
1111

1212
def setup
@@ -64,54 +64,54 @@ def assert_servable_asset_url(url)
6464

6565
class NoHostHelperTest < HelperTest
6666
def test_javascript_include_tag
67-
assert_equal %(<script src="/javascripts/static.js"></script>),
67+
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
6868
@view.javascript_include_tag("static")
69-
assert_equal %(<script src="/javascripts/static.js"></script>),
69+
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
7070
@view.javascript_include_tag("static.js")
71-
assert_equal %(<script src="/javascripts/static.js"></script>),
71+
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
7272
@view.javascript_include_tag(:static)
7373

74-
assert_equal %(<script src="/elsewhere.js"></script>),
74+
assert_dom_equal %(<script src="/elsewhere.js"></script>),
7575
@view.javascript_include_tag("/elsewhere.js")
76-
assert_equal %(<script src="/script1.js"></script>\n<script src="/javascripts/script2.js"></script>),
76+
assert_dom_equal %(<script src="/script1.js"></script>\n<script src="/javascripts/script2.js"></script>),
7777
@view.javascript_include_tag("/script1.js", "script2.js")
7878

79-
assert_equal %(<script src="http://example.com/script"></script>),
79+
assert_dom_equal %(<script src="http://example.com/script"></script>),
8080
@view.javascript_include_tag("http://example.com/script")
81-
assert_equal %(<script src="http://example.com/script.js"></script>),
81+
assert_dom_equal %(<script src="http://example.com/script.js"></script>),
8282
@view.javascript_include_tag("http://example.com/script.js")
83-
assert_equal %(<script src="//example.com/script.js"></script>),
83+
assert_dom_equal %(<script src="//example.com/script.js"></script>),
8484
@view.javascript_include_tag("//example.com/script.js")
8585

86-
assert_equal %(<script defer="defer" src="/javascripts/static.js"></script>),
86+
assert_dom_equal %(<script defer="defer" src="/javascripts/static.js"></script>),
8787
@view.javascript_include_tag("static", :defer => "defer")
88-
assert_equal %(<script async="async" src="/javascripts/static.js"></script>),
88+
assert_dom_equal %(<script async="async" src="/javascripts/static.js"></script>),
8989
@view.javascript_include_tag("static", :async => "async")
9090
end
9191

9292
def test_stylesheet_link_tag
93-
assert_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
93+
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
9494
@view.stylesheet_link_tag("static")
95-
assert_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
95+
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
9696
@view.stylesheet_link_tag("static.css")
97-
assert_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
97+
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
9898
@view.stylesheet_link_tag(:static)
9999

100-
assert_equal %(<link href="/elsewhere.css" media="screen" rel="stylesheet" />),
100+
assert_dom_equal %(<link href="/elsewhere.css" media="screen" rel="stylesheet" />),
101101
@view.stylesheet_link_tag("/elsewhere.css")
102-
assert_equal %(<link href="/style1.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/style2.css" media="screen" rel="stylesheet" />),
102+
assert_dom_equal %(<link href="/style1.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/style2.css" media="screen" rel="stylesheet" />),
103103
@view.stylesheet_link_tag("/style1.css", "style2.css")
104104

105-
assert_equal %(<link href="http://www.example.com/styles/style" media="screen" rel="stylesheet" />),
105+
assert_dom_equal %(<link href="http://www.example.com/styles/style" media="screen" rel="stylesheet" />),
106106
@view.stylesheet_link_tag("http://www.example.com/styles/style")
107-
assert_equal %(<link href="http://www.example.com/styles/style.css" media="screen" rel="stylesheet" />),
107+
assert_dom_equal %(<link href="http://www.example.com/styles/style.css" media="screen" rel="stylesheet" />),
108108
@view.stylesheet_link_tag("http://www.example.com/styles/style.css")
109-
assert_equal %(<link href="//www.example.com/styles/style.css" media="screen" rel="stylesheet" />),
109+
assert_dom_equal %(<link href="//www.example.com/styles/style.css" media="screen" rel="stylesheet" />),
110110
@view.stylesheet_link_tag("//www.example.com/styles/style.css")
111111

112-
assert_equal %(<link href="/stylesheets/print.css" media="print" rel="stylesheet" />),
112+
assert_dom_equal %(<link href="/stylesheets/print.css" media="print" rel="stylesheet" />),
113113
@view.stylesheet_link_tag("print", :media => "print")
114-
assert_equal %(<link href="/stylesheets/print.css" media="&lt;hax&gt;" rel="stylesheet" />),
114+
assert_dom_equal %(<link href="/stylesheets/print.css" media="&lt;hax&gt;" rel="stylesheet" />),
115115
@view.stylesheet_link_tag("print", :media => "<hax>")
116116
end
117117

@@ -161,11 +161,11 @@ def test_javascript_path
161161
assert_equal "//assets.example.com/javascripts/xmlhr.js#hash", @view.javascript_path("xmlhr#hash")
162162
assert_equal "//assets.example.com/javascripts/xmlhr.js?foo=1#hash", @view.javascript_path("xmlhr.js?foo=1#hash")
163163

164-
assert_equal %(<script src="//assets.example.com/assets/foo.js"></script>),
164+
assert_dom_equal %(<script src="//assets.example.com/assets/foo.js"></script>),
165165
@view.javascript_include_tag("foo")
166-
assert_equal %(<script src="//assets.example.com/assets/foo.js"></script>),
166+
assert_dom_equal %(<script src="//assets.example.com/assets/foo.js"></script>),
167167
@view.javascript_include_tag("foo.js")
168-
assert_equal %(<script src="//assets.example.com/assets/foo.js"></script>),
168+
assert_dom_equal %(<script src="//assets.example.com/assets/foo.js"></script>),
169169
@view.javascript_include_tag(:foo)
170170
end
171171

@@ -181,11 +181,11 @@ def test_stylesheet_path
181181
assert_equal "//assets.example.com/stylesheets/bank.css#hash", @view.stylesheet_path("bank#hash")
182182
assert_equal "//assets.example.com/stylesheets/bank.css?foo=1#hash", @view.stylesheet_path("bank.css?foo=1#hash")
183183

184-
assert_equal %(<link href="//assets.example.com/assets/foo.css" media="screen" rel="stylesheet" />),
184+
assert_dom_equal %(<link href="//assets.example.com/assets/foo.css" media="screen" rel="stylesheet" />),
185185
@view.stylesheet_link_tag("foo")
186-
assert_equal %(<link href="//assets.example.com/assets/foo.css" media="screen" rel="stylesheet" />),
186+
assert_dom_equal %(<link href="//assets.example.com/assets/foo.css" media="screen" rel="stylesheet" />),
187187
@view.stylesheet_link_tag("foo.css")
188-
assert_equal %(<link href="//assets.example.com/assets/foo.css" media="screen" rel="stylesheet" />),
188+
assert_dom_equal %(<link href="//assets.example.com/assets/foo.css" media="screen" rel="stylesheet" />),
189189
@view.stylesheet_link_tag(:foo)
190190
end
191191

@@ -206,11 +206,11 @@ def setup
206206
def test_javascript_include_tag
207207
super
208208

209-
assert_equal %(<script src="/assets/foo.js"></script>),
209+
assert_dom_equal %(<script src="/assets/foo.js"></script>),
210210
@view.javascript_include_tag("foo")
211-
assert_equal %(<script src="/assets/foo.js"></script>),
211+
assert_dom_equal %(<script src="/assets/foo.js"></script>),
212212
@view.javascript_include_tag("foo.js")
213-
assert_equal %(<script src="/assets/foo.js"></script>),
213+
assert_dom_equal %(<script src="/assets/foo.js"></script>),
214214
@view.javascript_include_tag(:foo)
215215

216216
assert_servable_asset_url "/assets/foo.js"
@@ -219,11 +219,11 @@ def test_javascript_include_tag
219219
def test_stylesheet_link_tag
220220
super
221221

222-
assert_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
222+
assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
223223
@view.stylesheet_link_tag("foo")
224-
assert_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
224+
assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
225225
@view.stylesheet_link_tag("foo.css")
226-
assert_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
226+
assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
227227
@view.stylesheet_link_tag(:foo)
228228

229229
assert_servable_asset_url "/assets/foo.css"
@@ -264,11 +264,11 @@ def setup
264264
def test_javascript_include_tag
265265
super
266266

267-
assert_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
267+
assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
268268
@view.javascript_include_tag("foo")
269-
assert_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
269+
assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
270270
@view.javascript_include_tag("foo.js")
271-
assert_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
271+
assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
272272
@view.javascript_include_tag(:foo)
273273

274274
assert_servable_asset_url "/assets/foo-#{@foo_js_digest}.js"
@@ -277,11 +277,11 @@ def test_javascript_include_tag
277277
def test_stylesheet_link_tag
278278
super
279279

280-
assert_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
280+
assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
281281
@view.stylesheet_link_tag("foo")
282-
assert_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
282+
assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
283283
@view.stylesheet_link_tag("foo.css")
284-
assert_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
284+
assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
285285
@view.stylesheet_link_tag(:foo)
286286

287287
assert_servable_asset_url "/assets/foo-#{@foo_css_digest}.css"
@@ -326,11 +326,11 @@ def setup
326326
def test_javascript_include_tag
327327
super
328328

329-
assert_equal %(<script src="/assets/foo.js?body=1"></script>),
329+
assert_dom_equal %(<script src="/assets/foo.js?body=1"></script>),
330330
@view.javascript_include_tag(:foo)
331-
assert_equal %(<script src="/assets/foo.js?body=1"></script>\n<script src="/assets/bar.js?body=1"></script>),
331+
assert_dom_equal %(<script src="/assets/foo.js?body=1"></script>\n<script src="/assets/bar.js?body=1"></script>),
332332
@view.javascript_include_tag(:bar)
333-
assert_equal %(<script src="/assets/dependency.js?body=1"></script>\n<script src="/assets/file1.js?body=1"></script>\n<script src="/assets/file2.js?body=1"></script>),
333+
assert_dom_equal %(<script src="/assets/dependency.js?body=1"></script>\n<script src="/assets/file1.js?body=1"></script>\n<script src="/assets/file2.js?body=1"></script>),
334334
@view.javascript_include_tag(:file1, :file2)
335335

336336
assert_servable_asset_url "/assets/foo.js?body=1"
@@ -343,11 +343,11 @@ def test_javascript_include_tag
343343
def test_stylesheet_link_tag
344344
super
345345

346-
assert_equal %(<link href="/assets/foo.css?body=1" media="screen" rel="stylesheet" />),
346+
assert_dom_equal %(<link href="/assets/foo.css?body=1" media="screen" rel="stylesheet" />),
347347
@view.stylesheet_link_tag(:foo)
348-
assert_equal %(<link href="/assets/foo.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/bar.css?body=1" media="screen" rel="stylesheet" />),
348+
assert_dom_equal %(<link href="/assets/foo.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/bar.css?body=1" media="screen" rel="stylesheet" />),
349349
@view.stylesheet_link_tag(:bar)
350-
assert_equal %(<link href="/assets/dependency.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file1.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file2.css?body=1" media="screen" rel="stylesheet" />),
350+
assert_dom_equal %(<link href="/assets/dependency.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file1.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file2.css?body=1" media="screen" rel="stylesheet" />),
351351
@view.stylesheet_link_tag(:file1, :file2)
352352

353353
assert_servable_asset_url "/assets/foo.css?body=1"
@@ -383,11 +383,11 @@ def setup
383383
def test_javascript_include_tag
384384
super
385385

386-
assert_equal %(<script src="/assets/foo-#{@foo_js_digest}.js?body=1"></script>),
386+
assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js?body=1"></script>),
387387
@view.javascript_include_tag(:foo)
388-
assert_equal %(<script src="/assets/foo-#{@foo_js_digest}.js?body=1"></script>\n<script src="/assets/bar-#{@bar_js_digest}.js?body=1"></script>),
388+
assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js?body=1"></script>\n<script src="/assets/bar-#{@bar_js_digest}.js?body=1"></script>),
389389
@view.javascript_include_tag(:bar)
390-
assert_equal %(<script src="/assets/dependency-#{@dependency_js_digest}.js?body=1"></script>\n<script src="/assets/file1-#{@file1_js_digest}.js?body=1"></script>\n<script src="/assets/file2-#{@file1_js_digest}.js?body=1"></script>),
390+
assert_dom_equal %(<script src="/assets/dependency-#{@dependency_js_digest}.js?body=1"></script>\n<script src="/assets/file1-#{@file1_js_digest}.js?body=1"></script>\n<script src="/assets/file2-#{@file1_js_digest}.js?body=1"></script>),
391391
@view.javascript_include_tag(:file1, :file2)
392392

393393
assert_servable_asset_url "/assets/foo-#{@foo_js_digest}.js?body=1"
@@ -400,11 +400,11 @@ def test_javascript_include_tag
400400
def test_stylesheet_link_tag
401401
super
402402

403-
assert_equal %(<link href="/assets/foo-#{@foo_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
403+
assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
404404
@view.stylesheet_link_tag(:foo)
405-
assert_equal %(<link href="/assets/foo-#{@foo_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/bar-#{@bar_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
405+
assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/bar-#{@bar_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
406406
@view.stylesheet_link_tag(:bar)
407-
assert_equal %(<link href="/assets/dependency-#{@dependency_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file1-#{@file1_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file2-#{@file2_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
407+
assert_dom_equal %(<link href="/assets/dependency-#{@dependency_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file1-#{@file1_css_digest}.css?body=1" media="screen" rel="stylesheet" />\n<link href="/assets/file2-#{@file2_css_digest}.css?body=1" media="screen" rel="stylesheet" />),
408408
@view.stylesheet_link_tag(:file1, :file2)
409409

410410
assert_servable_asset_url "/assets/foo-#{@foo_css_digest}.css?body=1"
@@ -460,22 +460,22 @@ def setup
460460
def test_javascript_include_tag
461461
super
462462

463-
assert_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
463+
assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
464464
@view.javascript_include_tag("foo")
465-
assert_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
465+
assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
466466
@view.javascript_include_tag("foo.js")
467-
assert_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
467+
assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
468468
@view.javascript_include_tag(:foo)
469469
end
470470

471471
def test_stylesheet_link_tag
472472
super
473473

474-
assert_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
474+
assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
475475
@view.stylesheet_link_tag("foo")
476-
assert_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
476+
assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
477477
@view.stylesheet_link_tag("foo.css")
478-
assert_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
478+
assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
479479
@view.stylesheet_link_tag(:foo)
480480
end
481481

0 commit comments

Comments
 (0)