From 0d41c86522ef912fe5bb7a02fd434080f9827c00 Mon Sep 17 00:00:00 2001 From: Andres Ornelas Date: Wed, 26 May 2010 15:17:28 -0700 Subject: fixed broken jstd conf file --- jsTestDriver-jquery.conf | 1 + jsTestDriver.conf | 1 + src/Browser.js | 1 - src/scenario/Runner.js | 12 ++++++------ 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/jsTestDriver-jquery.conf b/jsTestDriver-jquery.conf index 953e4521..34538bce 100644 --- a/jsTestDriver-jquery.conf +++ b/jsTestDriver-jquery.conf @@ -19,5 +19,6 @@ exclude: - src/angular.suffix - src/angular-bootstrap.js - src/AngularPublic.js + - src/scenario/bootstrap.js - test/jquery_remove.js diff --git a/jsTestDriver.conf b/jsTestDriver.conf index c28e9ff1..16bcf1db 100644 --- a/jsTestDriver.conf +++ b/jsTestDriver.conf @@ -19,4 +19,5 @@ exclude: - src/angular.prefix - src/angular.suffix - src/angular-bootstrap.js + - src/scenario/bootstrap.js - src/AngularPublic.js diff --git a/src/Browser.js b/src/Browser.js index 2a90b63f..8abdbc61 100644 --- a/src/Browser.js +++ b/src/Browser.js @@ -1,4 +1,3 @@ - ////////////////////////////// // Browser ////////////////////////////// diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js index 01e16e79..68c3ff65 100644 --- a/src/scenario/Runner.js +++ b/src/scenario/Runner.js @@ -29,7 +29,7 @@ angular.scenario.Runner = function(scope, jQuery){ self.currentSpec = null; }; this.logger = function returnNoop(){ - return _(returnNoop).extend({close:_.identity, fail:_.identity});; + return extend(returnNoop, {close:noop, fail:noop});; }; }; @@ -59,7 +59,7 @@ angular.scenario.Runner.prototype = { var element = jQuery('