Skip to content

Commit

Permalink
Fix failing railties tests
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
prathamesh-sonpatki committed Jun 19, 2016
1 parent 94ef224 commit acad62b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions railties/test/railties/engine_test.rb
Expand Up @@ -1155,10 +1155,10 @@ def bar
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)
Expand Down

0 comments on commit acad62b

Please sign in to comment.