aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorPrathamesh Sonpatki <csonpatki@gmail.com>2016-06-18 20:17:28 -0700
committerPrathamesh Sonpatki <csonpatki@gmail.com>2016-06-18 20:56:21 -0700
commitacad62bce549cffaefe865a3f3c21aca79d8b76a (patch)
treedeb80c44cc10dd9a7ed9746a613a14de218d1d05 /railties
parent94ef224aa61ace3fa643eab161ff9056b7d90a62 (diff)
downloadrails-acad62bce549cffaefe865a3f3c21aca79d8b76a.tar.gz
rails-acad62bce549cffaefe865a3f3c21aca79d8b76a.tar.bz2
rails-acad62bce549cffaefe865a3f3c21aca79d8b76a.zip
Fix failing railties tests
- Railties tests related to fetching asset URL started failing after the release of sprockets 3.6.1 on Travis. - This was due to the change in https://github.com/rails/sprockets/pull/311/files which changed the logic in `concat_javascript_sources` to add `;` at the end of file if the source did not end with semicolon. - Bumped up sprockets minor version and fixed the failing tests.
Diffstat (limited to 'railties')
-rw-r--r--railties/test/railties/engine_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index b6fdd33898..fb8a7656d0 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -1155,10 +1155,10 @@ YAML
assert_equal "App's bar partial", last_response.body.strip
get("/assets/foo.js")
- assert_equal "// Bukkit's foo js", last_response.body.strip
+ assert_match "// Bukkit's foo js", last_response.body.strip
get("/assets/bar.js")
- assert_equal "// App's bar js", last_response.body.strip
+ assert_match "// App's bar js", last_response.body.strip
# ensure that railties are not added twice
railties = Rails.application.send(:ordered_railties).map(&:class)