Skip to content

Commit

Permalink
Don't Fingerprint in --environment test
Browse files Browse the repository at this point in the history
When running `ember test` from Rails, don't fingerprint assets.
  • Loading branch information
seanpdoyle committed Nov 14, 2015
1 parent b2a1d8f commit ab8896e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
master
------

* Don't fingerprint assets when running `ember test` from Rails.
* Introduce file in `app/initializers` to setup Rails CSRF integration [#19]
* Prepend Sprockets path to EmberCLI assets.
Default fingerprinting to no generate `MD5` hash when building in
Expand Down
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module.exports = {
app.options.storeConfigInMeta = false;
softSet(app.options, 'fingerprint', {});

if (typeof process.env.RAILS_ENV !== 'undefined') {
if (app.env !== 'test' && typeof process.env.RAILS_ENV !== 'undefined') {
var origin = process.env.ASSET_HOST ||
process.env.CDN_HOST ||
app.options.origin ||
Expand Down

0 comments on commit ab8896e

Please sign in to comment.