spec/dummy/tmp/cache/assets/D05/8D0/sprockets%2F319f8f235f452343f1ebf03cb262d23d in teabag-0.5.5 vs spec/dummy/tmp/cache/assets/D05/8D0/sprockets%2F319f8f235f452343f1ebf03cb262d23d in teabag-0.6.0
- old
+ new
@@ -1,8 +1,8 @@
-o: ActiveSupport::Cache::Entry :@compressedF:@expires_in0:@created_atf1360718175.6347709:@value"[&{I"
+o: ActiveSupport::Cache::Entry :@compressedF:@expires_in0:@created_atf1361302430.933271:@value"Â'{I"
class:EFI"BundledAsset; FI"logical_path; FI"$teabag/phantomjs/runner_spec.js; TI"
pathname; FI"Z/Users/jejacks0n/Projects/teabag/spec/javascripts/teabag/phantomjs/runner_spec.coffee; FI"content_type; FI"application/javascript; FI"
-mtime; FI"2013-02-12T18:14:07-07:00; FI"length; Fiq$I"digest; F"%1559e89c0faebbd059e8de83a895c22dI"source; FI"q$(function() {
+mtime; FI"2013-02-16T14:42:32-07:00; FI"length; FiØ%I"digest; F"%e184e86ce751cceae5bb5d867c5f9fe5I"source; FI"Ø%(function() {
window.phantom = {
exit: function() {}
};
@@ -264,19 +264,29 @@
Runner.prototype.pageCallbacks = function() {
var _this = this;
return {
onError: function(message, trace) {
- return console.log(JSON.stringify({
+ console.log(JSON.stringify({
_teabag: true,
type: "error",
message: message,
trace: trace
}));
+ return _this.errored = true;
},
onConsoleMessage: function(msg) {
- return console.log(msg);
+ console.log(msg);
+ if (_this.errorTimeout) {
+ clearTimeout(_this.errorTimeout);
+ }
+ if (_this.errored) {
+ _this.errorTimeout = setTimeout((function() {
+ return _this.fail('Javascript error has cause a timeout.');
+ }), 1000);
+ return _this.errored = false;
+ }
},
onLoadFinished: function(status) {
var defined;
if (_this.start) {
return;
@@ -299,6 +309,6 @@
})();
new Runner().run();
}).call(this);
-; FI"required_assets_digest; F"%46f9b9580ac0cf8b89808c586326d26bI"
_version; F"%6776f581a4329e299531e1d52aa59832
+; FI"required_assets_digest; F"%58fb477d2b6632066fd28d55384ad3fbI"
_version; F"%6776f581a4329e299531e1d52aa59832
\ No newline at end of file