summaryrefslogtreecommitdiff
path: root/spec/javascripts
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2014-06-09 20:25:08 -0600
committermo khan <mo@mokhan.ca>2014-06-09 20:25:08 -0600
commit211174b54f0ddd85f8f493dd7beb752af26dce38 (patch)
tree040688116d5ddd91b5c88d40ad4ccc4d01ff1a46 /spec/javascripts
parent09d2c79f52354a5aa81179e7d04a324f111dd477 (diff)
fix teaspoon errors.
Diffstat (limited to 'spec/javascripts')
-rw-r--r--spec/javascripts/spec_helper.js15
1 files changed, 10 insertions, 5 deletions
diff --git a/spec/javascripts/spec_helper.js b/spec/javascripts/spec_helper.js
index 24b88290..e3a81ec6 100644
--- a/spec/javascripts/spec_helper.js
+++ b/spec/javascripts/spec_helper.js
@@ -1,11 +1,16 @@
// Teaspoon includes some support files, but you can use anything from your own support path too.
-// require support/jasmine-jquery
+// require support/jasmine-jquery-1.7.0
+// require support/jasmine-jquery-2.0.0
// require support/sinon
// require support/your-support-file
//
+// PhantomJS (Teaspoons default driver) doesn't have support for Function.prototype.bind, which has caused confusion.
+// Use this polyfill to avoid the confusion.
+//= require support/bind-poly
+//
// Deferring execution
-// If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call Teaspoon.execute()
-// after everything has been loaded. Simple example of a timeout:
+// If you're using CommonJS, RequireJS or some other asynchronous library you can defer execution. Call
+// Teaspoon.execute() after everything has been loaded. Simple example of a timeout:
//
// Teaspoon.defer = true
// setTimeout(Teaspoon.execute, 1000)
@@ -21,6 +26,6 @@
//
// For more information: http://github.com/modeset/teaspoon
//
-// You can require javascript files here. A good place to start is by requiring your application.js.
+// You can require your own javascript files here. By default this will include everything in application, however you
+// may get better load performance if you require the specific files that are being used in the spec that tests them.
//= require application
-