Merge remote-tracking branch 'upstream/pull/5389'

[rails.git] / test / javascripts / test_helper.js

diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index f2e89f31292097bdfa86892563216c2c2dd7b61d..879b6861b1d9b6037cd521ad03fa0cf7c0076b2b 100644 (file)
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -1,8 +1,9 @@
+/* eslint-disable */

 // Teaspoon includes some support files, but you can use anything from your own support path too.
 // require support/expect
 // require support/sinon
 //= require support/chai
 // Teaspoon includes some support files, but you can use anything from your own support path too.
 // require support/expect
 // require support/sinon
 //= require support/chai

-// require support/chai-jq-0.0.7
+//= require support/chai-jq-0.0.7

 // require support/your-support-file
 //
 // PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.
 // require support/your-support-file
 //
 // PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.


@@ -35,6 +36,6 @@
 // If you're using Chai, you'll probably want to initialize your preferred assertion style. You can read more about Chai
 // at: http://chaijs.com/guide/styles
 //
 // If you're using Chai, you'll probably want to initialize your preferred assertion style. You can read more about Chai
 // at: http://chaijs.com/guide/styles
 //

-// window.assert = chai.assert;
+window.assert = chai.assert;

 window.expect = chai.expect;
 window.expect = chai.expect;

-// window.should = chai.should();
+window.should = chai.should();