Skip to content

Commit 3ad8f0d

Browse files
pixeltrixpixeltrix
committed
Silence warnings about static path fallback
We know they're going away but they still need testing for now.
1 parent fc1badb commit 3ad8f0d

File tree

1 file changed

+140
-120
lines changed

1 file changed

+140
-120
lines changed

‎test/test_helper.rb‎

Lines changed: 140 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -107,103 +107,115 @@ def assert_servable_asset_url(url)
107107

108108
class NoHostHelperTest < HelperTest
109109
def test_javascript_include_tag
110-
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
111-
@view.javascript_include_tag("static")
112-
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
113-
@view.javascript_include_tag("static.js")
114-
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
115-
@view.javascript_include_tag(:static)
116-
117-
assert_dom_equal %(<script src="/elsewhere.js"></script>),
118-
@view.javascript_include_tag("/elsewhere.js")
119-
assert_dom_equal %(<script src="/script1.js"></script>\n<script src="/javascripts/script2.js"></script>),
120-
@view.javascript_include_tag("/script1.js", "script2.js")
121-
122-
assert_dom_equal %(<script src="http://example.com/script"></script>),
123-
@view.javascript_include_tag("http://example.com/script")
124-
assert_dom_equal %(<script src="http://example.com/script.js"></script>),
125-
@view.javascript_include_tag("http://example.com/script.js")
126-
assert_dom_equal %(<script src="//example.com/script.js"></script>),
127-
@view.javascript_include_tag("//example.com/script.js")
128-
129-
assert_dom_equal %(<script defer="defer" src="/javascripts/static.js"></script>),
130-
@view.javascript_include_tag("static", :defer => "defer")
131-
assert_dom_equal %(<script async="async" src="/javascripts/static.js"></script>),
132-
@view.javascript_include_tag("static", :async => "async")
110+
ActiveSupport::Deprecation.silence do
111+
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
112+
@view.javascript_include_tag("static")
113+
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
114+
@view.javascript_include_tag("static.js")
115+
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
116+
@view.javascript_include_tag(:static)
117+
118+
assert_dom_equal %(<script src="/elsewhere.js"></script>),
119+
@view.javascript_include_tag("/elsewhere.js")
120+
assert_dom_equal %(<script src="/script1.js"></script>\n<script src="/javascripts/script2.js"></script>),
121+
@view.javascript_include_tag("/script1.js", "script2.js")
122+
123+
assert_dom_equal %(<script src="http://example.com/script"></script>),
124+
@view.javascript_include_tag("http://example.com/script")
125+
assert_dom_equal %(<script src="http://example.com/script.js"></script>),
126+
@view.javascript_include_tag("http://example.com/script.js")
127+
assert_dom_equal %(<script src="//example.com/script.js"></script>),
128+
@view.javascript_include_tag("//example.com/script.js")
129+
130+
assert_dom_equal %(<script defer="defer" src="/javascripts/static.js"></script>),
131+
@view.javascript_include_tag("static", :defer => "defer")
132+
assert_dom_equal %(<script async="async" src="/javascripts/static.js"></script>),
133+
@view.javascript_include_tag("static", :async => "async")
134+
end
133135
end
134136

135137
def test_stylesheet_link_tag
136-
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
137-
@view.stylesheet_link_tag("static")
138-
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
139-
@view.stylesheet_link_tag("static.css")
140-
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
141-
@view.stylesheet_link_tag(:static)
142-
143-
assert_dom_equal %(<link href="/elsewhere.css" media="screen" rel="stylesheet" />),
144-
@view.stylesheet_link_tag("/elsewhere.css")
145-
assert_dom_equal %(<link href="/style1.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/style2.css" media="screen" rel="stylesheet" />),
146-
@view.stylesheet_link_tag("/style1.css", "style2.css")
147-
148-
assert_dom_equal %(<link href="http://www.example.com/styles/style" media="screen" rel="stylesheet" />),
149-
@view.stylesheet_link_tag("http://www.example.com/styles/style")
150-
assert_dom_equal %(<link href="http://www.example.com/styles/style.css" media="screen" rel="stylesheet" />),
151-
@view.stylesheet_link_tag("http://www.example.com/styles/style.css")
152-
assert_dom_equal %(<link href="//www.example.com/styles/style.css" media="screen" rel="stylesheet" />),
153-
@view.stylesheet_link_tag("//www.example.com/styles/style.css")
154-
155-
assert_dom_equal %(<link href="/stylesheets/print.css" media="print" rel="stylesheet" />),
156-
@view.stylesheet_link_tag("print", :media => "print")
157-
assert_dom_equal %(<link href="/stylesheets/print.css" media="&lt;hax&gt;" rel="stylesheet" />),
158-
@view.stylesheet_link_tag("print", :media => "<hax>")
138+
ActiveSupport::Deprecation.silence do
139+
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
140+
@view.stylesheet_link_tag("static")
141+
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
142+
@view.stylesheet_link_tag("static.css")
143+
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
144+
@view.stylesheet_link_tag(:static)
145+
146+
assert_dom_equal %(<link href="/elsewhere.css" media="screen" rel="stylesheet" />),
147+
@view.stylesheet_link_tag("/elsewhere.css")
148+
assert_dom_equal %(<link href="/style1.css" media="screen" rel="stylesheet" />\n<link href="/stylesheets/style2.css" media="screen" rel="stylesheet" />),
149+
@view.stylesheet_link_tag("/style1.css", "style2.css")
150+
151+
assert_dom_equal %(<link href="http://www.example.com/styles/style" media="screen" rel="stylesheet" />),
152+
@view.stylesheet_link_tag("http://www.example.com/styles/style")
153+
assert_dom_equal %(<link href="http://www.example.com/styles/style.css" media="screen" rel="stylesheet" />),
154+
@view.stylesheet_link_tag("http://www.example.com/styles/style.css")
155+
assert_dom_equal %(<link href="//www.example.com/styles/style.css" media="screen" rel="stylesheet" />),
156+
@view.stylesheet_link_tag("//www.example.com/styles/style.css")
157+
158+
assert_dom_equal %(<link href="/stylesheets/print.css" media="print" rel="stylesheet" />),
159+
@view.stylesheet_link_tag("print", :media => "print")
160+
assert_dom_equal %(<link href="/stylesheets/print.css" media="&lt;hax&gt;" rel="stylesheet" />),
161+
@view.stylesheet_link_tag("print", :media => "<hax>")
162+
end
159163
end
160164

161165
def test_javascript_include_tag_integrity
162-
assert_dom_equal %(<script src="/javascripts/static.js" integrity="sha-256-TvVUHzSfftWg1rcfL6TIJ0XKEGrgLyEq6lEpcmrG9qs="></script>),
163-
@view.javascript_include_tag("static", integrity: "sha-256-TvVUHzSfftWg1rcfL6TIJ0XKEGrgLyEq6lEpcmrG9qs=")
164-
165-
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
166-
@view.javascript_include_tag("static", integrity: true)
167-
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
168-
@view.javascript_include_tag("static", integrity: false)
169-
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
170-
@view.javascript_include_tag("static", integrity: nil)
166+
ActiveSupport::Deprecation.silence do
167+
assert_dom_equal %(<script src="/javascripts/static.js" integrity="sha-256-TvVUHzSfftWg1rcfL6TIJ0XKEGrgLyEq6lEpcmrG9qs="></script>),
168+
@view.javascript_include_tag("static", integrity: "sha-256-TvVUHzSfftWg1rcfL6TIJ0XKEGrgLyEq6lEpcmrG9qs=")
169+
170+
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
171+
@view.javascript_include_tag("static", integrity: true)
172+
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
173+
@view.javascript_include_tag("static", integrity: false)
174+
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
175+
@view.javascript_include_tag("static", integrity: nil)
176+
end
171177
end
172178

173179
def test_stylesheet_link_tag_integrity
174-
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" integrity="sha-256-5YzTQPuOJz/EpeXfN/+v1sxsjAj/dw8q26abiHZM3A4=" />),
175-
@view.stylesheet_link_tag("static", integrity: "sha-256-5YzTQPuOJz/EpeXfN/+v1sxsjAj/dw8q26abiHZM3A4=")
176-
177-
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
178-
@view.stylesheet_link_tag("static", integrity: true)
179-
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
180-
@view.stylesheet_link_tag("static", integrity: false)
180+
ActiveSupport::Deprecation.silence do
181+
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" integrity="sha-256-5YzTQPuOJz/EpeXfN/+v1sxsjAj/dw8q26abiHZM3A4=" />),
182+
@view.stylesheet_link_tag("static", integrity: "sha-256-5YzTQPuOJz/EpeXfN/+v1sxsjAj/dw8q26abiHZM3A4=")
183+
184+
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
185+
@view.stylesheet_link_tag("static", integrity: true)
186+
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
187+
@view.stylesheet_link_tag("static", integrity: false)
188+
end
181189
end
182190

183191
def test_javascript_path
184-
assert_equal "/javascripts/xmlhr.js", @view.javascript_path("xmlhr")
185-
assert_equal "/javascripts/xmlhr.js", @view.javascript_path("xmlhr.js")
186-
assert_equal "/javascripts/super/xmlhr.js", @view.javascript_path("super/xmlhr")
187-
assert_equal "/super/xmlhr.js", @view.javascript_path("/super/xmlhr")
188-
189-
assert_equal "/javascripts/xmlhr.js?foo=1", @view.javascript_path("xmlhr.js?foo=1")
190-
assert_equal "/javascripts/xmlhr.js?foo=1", @view.javascript_path("xmlhr?foo=1")
191-
assert_equal "/javascripts/xmlhr.js#hash", @view.javascript_path("xmlhr.js#hash")
192-
assert_equal "/javascripts/xmlhr.js#hash", @view.javascript_path("xmlhr#hash")
193-
assert_equal "/javascripts/xmlhr.js?foo=1#hash", @view.javascript_path("xmlhr.js?foo=1#hash")
192+
ActiveSupport::Deprecation.silence do
193+
assert_equal "/javascripts/xmlhr.js", @view.javascript_path("xmlhr")
194+
assert_equal "/javascripts/xmlhr.js", @view.javascript_path("xmlhr.js")
195+
assert_equal "/javascripts/super/xmlhr.js", @view.javascript_path("super/xmlhr")
196+
assert_equal "/super/xmlhr.js", @view.javascript_path("/super/xmlhr")
197+
198+
assert_equal "/javascripts/xmlhr.js?foo=1", @view.javascript_path("xmlhr.js?foo=1")
199+
assert_equal "/javascripts/xmlhr.js?foo=1", @view.javascript_path("xmlhr?foo=1")
200+
assert_equal "/javascripts/xmlhr.js#hash", @view.javascript_path("xmlhr.js#hash")
201+
assert_equal "/javascripts/xmlhr.js#hash", @view.javascript_path("xmlhr#hash")
202+
assert_equal "/javascripts/xmlhr.js?foo=1#hash", @view.javascript_path("xmlhr.js?foo=1#hash")
203+
end
194204
end
195205

196206
def test_stylesheet_path
197-
assert_equal "/stylesheets/bank.css", @view.stylesheet_path("bank")
198-
assert_equal "/stylesheets/bank.css", @view.stylesheet_path("bank.css")
199-
assert_equal "/stylesheets/subdir/subdir.css", @view.stylesheet_path("subdir/subdir")
200-
assert_equal "/subdir/subdir.css", @view.stylesheet_path("/subdir/subdir.css")
201-
202-
assert_equal "/stylesheets/bank.css?foo=1", @view.stylesheet_path("bank.css?foo=1")
203-
assert_equal "/stylesheets/bank.css?foo=1", @view.stylesheet_path("bank?foo=1")
204-
assert_equal "/stylesheets/bank.css#hash", @view.stylesheet_path("bank.css#hash")
205-
assert_equal "/stylesheets/bank.css#hash", @view.stylesheet_path("bank#hash")
206-
assert_equal "/stylesheets/bank.css?foo=1#hash", @view.stylesheet_path("bank.css?foo=1#hash")
207+
ActiveSupport::Deprecation.silence do
208+
assert_equal "/stylesheets/bank.css", @view.stylesheet_path("bank")
209+
assert_equal "/stylesheets/bank.css", @view.stylesheet_path("bank.css")
210+
assert_equal "/stylesheets/subdir/subdir.css", @view.stylesheet_path("subdir/subdir")
211+
assert_equal "/subdir/subdir.css", @view.stylesheet_path("/subdir/subdir.css")
212+
213+
assert_equal "/stylesheets/bank.css?foo=1", @view.stylesheet_path("bank.css?foo=1")
214+
assert_equal "/stylesheets/bank.css?foo=1", @view.stylesheet_path("bank?foo=1")
215+
assert_equal "/stylesheets/bank.css#hash", @view.stylesheet_path("bank.css#hash")
216+
assert_equal "/stylesheets/bank.css#hash", @view.stylesheet_path("bank#hash")
217+
assert_equal "/stylesheets/bank.css?foo=1#hash", @view.stylesheet_path("bank.css?foo=1#hash")
218+
end
207219
end
208220
end
209221

@@ -215,30 +227,34 @@ def setup
215227
end
216228

217229
def test_javascript_include_tag_integrity
218-
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
219-
@view.javascript_include_tag("static", integrity: true)
220-
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
221-
@view.javascript_include_tag("static", integrity: false)
222-
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
223-
@view.javascript_include_tag("static", integrity: nil)
224-
225-
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
226-
@view.javascript_include_tag("static", integrity: "sha-256-TvVUHzSfftWg1rcfL6TIJ0XKEGrgLyEq6lEpcmrG9qs=")
230+
ActiveSupport::Deprecation.silence do
231+
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
232+
@view.javascript_include_tag("static", integrity: true)
233+
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
234+
@view.javascript_include_tag("static", integrity: false)
235+
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
236+
@view.javascript_include_tag("static", integrity: nil)
237+
238+
assert_dom_equal %(<script src="/javascripts/static.js"></script>),
239+
@view.javascript_include_tag("static", integrity: "sha-256-TvVUHzSfftWg1rcfL6TIJ0XKEGrgLyEq6lEpcmrG9qs=")
240+
end
227241

228242
assert_dom_equal %(<script src="/assets/foo.js"></script>),
229243
@view.javascript_include_tag("foo", integrity: true)
230244
end
231245

232246
def test_stylesheet_link_tag_integrity
233-
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
234-
@view.stylesheet_link_tag("static", integrity: true)
235-
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
236-
@view.stylesheet_link_tag("static", integrity: false)
237-
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
238-
@view.stylesheet_link_tag("static", integrity: nil)
239-
240-
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
241-
@view.stylesheet_link_tag("static", integrity: "sha-256-5YzTQPuOJz/EpeXfN/+v1sxsjAj/dw8q26abiHZM3A4=")
247+
ActiveSupport::Deprecation.silence do
248+
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
249+
@view.stylesheet_link_tag("static", integrity: true)
250+
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
251+
@view.stylesheet_link_tag("static", integrity: false)
252+
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
253+
@view.stylesheet_link_tag("static", integrity: nil)
254+
255+
assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
256+
@view.stylesheet_link_tag("static", integrity: "sha-256-5YzTQPuOJz/EpeXfN/+v1sxsjAj/dw8q26abiHZM3A4=")
257+
end
242258

243259
assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
244260
@view.stylesheet_link_tag("foo", integrity: true)
@@ -302,16 +318,18 @@ def setup
302318
end
303319

304320
def test_javascript_path
305-
assert_equal "https://assets.example.com/javascripts/xmlhr.js", @view.javascript_path("xmlhr")
306-
assert_equal "https://assets.example.com/javascripts/xmlhr.js", @view.javascript_path("xmlhr.js")
307-
assert_equal "https://assets.example.com/javascripts/super/xmlhr.js", @view.javascript_path("super/xmlhr")
308-
assert_equal "https://assets.example.com/super/xmlhr.js", @view.javascript_path("/super/xmlhr")
309-
310-
assert_equal "https://assets.example.com/javascripts/xmlhr.js?foo=1", @view.javascript_path("xmlhr.js?foo=1")
311-
assert_equal "https://assets.example.com/javascripts/xmlhr.js?foo=1", @view.javascript_path("xmlhr?foo=1")
312-
assert_equal "https://assets.example.com/javascripts/xmlhr.js#hash", @view.javascript_path("xmlhr.js#hash")
313-
assert_equal "https://assets.example.com/javascripts/xmlhr.js#hash", @view.javascript_path("xmlhr#hash")
314-
assert_equal "https://assets.example.com/javascripts/xmlhr.js?foo=1#hash", @view.javascript_path("xmlhr.js?foo=1#hash")
321+
ActiveSupport::Deprecation.silence do
322+
assert_equal "https://assets.example.com/javascripts/xmlhr.js", @view.javascript_path("xmlhr")
323+
assert_equal "https://assets.example.com/javascripts/xmlhr.js", @view.javascript_path("xmlhr.js")
324+
assert_equal "https://assets.example.com/javascripts/super/xmlhr.js", @view.javascript_path("super/xmlhr")
325+
assert_equal "https://assets.example.com/super/xmlhr.js", @view.javascript_path("/super/xmlhr")
326+
327+
assert_equal "https://assets.example.com/javascripts/xmlhr.js?foo=1", @view.javascript_path("xmlhr.js?foo=1")
328+
assert_equal "https://assets.example.com/javascripts/xmlhr.js?foo=1", @view.javascript_path("xmlhr?foo=1")
329+
assert_equal "https://assets.example.com/javascripts/xmlhr.js#hash", @view.javascript_path("xmlhr.js#hash")
330+
assert_equal "https://assets.example.com/javascripts/xmlhr.js#hash", @view.javascript_path("xmlhr#hash")
331+
assert_equal "https://assets.example.com/javascripts/xmlhr.js?foo=1#hash", @view.javascript_path("xmlhr.js?foo=1#hash")
332+
end
315333

316334
assert_dom_equal %(<script src="https://assets.example.com/assets/foo.js"></script>),
317335
@view.javascript_include_tag("foo")
@@ -322,16 +340,18 @@ def test_javascript_path
322340
end
323341

324342
def test_stylesheet_path
325-
assert_equal "https://assets.example.com/stylesheets/bank.css", @view.stylesheet_path("bank")
326-
assert_equal "https://assets.example.com/stylesheets/bank.css", @view.stylesheet_path("bank.css")
327-
assert_equal "https://assets.example.com/stylesheets/subdir/subdir.css", @view.stylesheet_path("subdir/subdir")
328-
assert_equal "https://assets.example.com/subdir/subdir.css", @view.stylesheet_path("/subdir/subdir.css")
329-
330-
assert_equal "https://assets.example.com/stylesheets/bank.css?foo=1", @view.stylesheet_path("bank.css?foo=1")
331-
assert_equal "https://assets.example.com/stylesheets/bank.css?foo=1", @view.stylesheet_path("bank?foo=1")
332-
assert_equal "https://assets.example.com/stylesheets/bank.css#hash", @view.stylesheet_path("bank.css#hash")
333-
assert_equal "https://assets.example.com/stylesheets/bank.css#hash", @view.stylesheet_path("bank#hash")
334-
assert_equal "https://assets.example.com/stylesheets/bank.css?foo=1#hash", @view.stylesheet_path("bank.css?foo=1#hash")
343+
ActiveSupport::Deprecation.silence do
344+
assert_equal "https://assets.example.com/stylesheets/bank.css", @view.stylesheet_path("bank")
345+
assert_equal "https://assets.example.com/stylesheets/bank.css", @view.stylesheet_path("bank.css")
346+
assert_equal "https://assets.example.com/stylesheets/subdir/subdir.css", @view.stylesheet_path("subdir/subdir")
347+
assert_equal "https://assets.example.com/subdir/subdir.css", @view.stylesheet_path("/subdir/subdir.css")
348+
349+
assert_equal "https://assets.example.com/stylesheets/bank.css?foo=1", @view.stylesheet_path("bank.css?foo=1")
350+
assert_equal "https://assets.example.com/stylesheets/bank.css?foo=1", @view.stylesheet_path("bank?foo=1")
351+
assert_equal "https://assets.example.com/stylesheets/bank.css#hash", @view.stylesheet_path("bank.css#hash")
352+
assert_equal "https://assets.example.com/stylesheets/bank.css#hash", @view.stylesheet_path("bank#hash")
353+
assert_equal "https://assets.example.com/stylesheets/bank.css?foo=1#hash", @view.stylesheet_path("bank.css?foo=1#hash")
354+
end
335355

336356
assert_dom_equal %(<link href="https://assets.example.com/assets/foo.css" media="screen" rel="stylesheet" />),
337357
@view.stylesheet_link_tag("foo")

0 commit comments

Comments
 (0)