diff options
| author | Prathamesh Sonpatki <csonpatki@gmail.com> | 2016-06-18 20:17:28 -0700 |
|---|---|---|
| committer | Prathamesh Sonpatki <csonpatki@gmail.com> | 2016-06-18 20:56:21 -0700 |
| commit | acad62bce549cffaefe865a3f3c21aca79d8b76a (patch) | |
| tree | deb80c44cc10dd9a7ed9746a613a14de218d1d05 | |
| parent | 94ef224aa61ace3fa643eab161ff9056b7d90a62 (diff) | |
| download | rails-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.
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | railties/test/railties/engine_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8b31934301..71f4302a5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -300,7 +300,7 @@ GEM serverengine (~> 1.5.11) thor thread (~> 0.1.7) - sprockets (3.6.0) + sprockets (3.6.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-export (0.9.1) 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) |