aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndres Ornelas2010-05-26 15:17:28 -0700
committerAndres Ornelas2010-05-26 15:17:28 -0700
commit0d41c86522ef912fe5bb7a02fd434080f9827c00 (patch)
tree1eb8cc105c1b1057bbe8cbd2076916f5c4f80356
parent5992e81b2e302c3b3375567e347227f6a9496585 (diff)
downloadangular.js-0d41c86522ef912fe5bb7a02fd434080f9827c00.tar.bz2
fixed broken jstd conf file
-rw-r--r--jsTestDriver-jquery.conf1
-rw-r--r--jsTestDriver.conf1
-rw-r--r--src/Browser.js1
-rw-r--r--src/scenario/Runner.js12
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('<li class="running '+type+'"><span></span></li>');
element.find('span').text(text);
container.append(element);
- return _(logger(element)).extend({
+ return extend(logger(element), {
close: function(){
element.removeClass('running');
if(!element.hasClass('fail'))
@@ -80,7 +80,7 @@ angular.scenario.Runner.prototype = {
}
this.logger = logger(console);
var specNames = [];
- _(this.specs).each(function(spec, name){
+ foreach(this.specs, function(spec, name){
specNames.push(name);
}, this);
specNames.sort();
@@ -108,7 +108,7 @@ angular.scenario.Runner.prototype = {
result.passed = false;
result.failed = true;
result.error = error;
- result.log('fail', _(error).isString() ? error : toJson(error)).fail();
+ result.log('fail', isString(error) ? error : toJson(error)).fail();
}
};
specThis = {
@@ -121,11 +121,11 @@ angular.scenario.Runner.prototype = {
function done() {
result.finished = true;
stepLogger.close();
- (callback||_.identity).call(specThis);
+ (callback||noop).call(specThis);
}
function next(){
var step = spec.steps[spec.nextStepIndex];
- (result.log || {close:_.identity}).close();
+ (result.log || {close:noop}).close();
result.log = null;
if (step) {
spec.nextStepIndex ++;