diff options
| author | Igor Minar | 2011-01-07 22:02:23 -0800 |
|---|---|---|
| committer | Igor Minar | 2011-01-10 10:26:55 -0800 |
| commit | 0a6cf70debc6440685af3f9ea96a66450e4f4ed7 (patch) | |
| tree | 3b7e82bedf53960deb5d460532779ec449dd8dfc /src/scenario | |
| parent | c79aba92f6b058742c9ae20a9382f6abc68afcea (diff) | |
| download | angular.js-0a6cf70debc6440685af3f9ea96a66450e4f4ed7.tar.bz2 | |
Rename angular.foreach to angular.forEach to make the api consistent.
camelcase is used for other angular functions and forEach is also
used by EcmaScript standard.
- rename the internal as well as the external function name
- tweak the implementation of the function so that it doesn't
clober it self when we extend the angular object with an
object that has a forEach property equal to this forEach function
Closes #85
Diffstat (limited to 'src/scenario')
| -rw-r--r-- | src/scenario/Describe.js | 10 | ||||
| -rw-r--r-- | src/scenario/ObjectModel.js | 2 | ||||
| -rw-r--r-- | src/scenario/Runner.js | 10 | ||||
| -rw-r--r-- | src/scenario/Scenario.js | 4 | ||||
| -rw-r--r-- | src/scenario/SpecRunner.js | 2 | ||||
| -rw-r--r-- | src/scenario/dsl.js | 4 | ||||
| -rw-r--r-- | src/scenario/output/Html.js | 2 | ||||
| -rw-r--r-- | src/scenario/output/Xml.js | 6 |
8 files changed, 20 insertions, 20 deletions
diff --git a/src/scenario/Describe.js b/src/scenario/Describe.js index 69ed8238..50cfded6 100644 --- a/src/scenario/Describe.js +++ b/src/scenario/Describe.js @@ -21,7 +21,7 @@ angular.scenario.Describe = function(descName, parent) { var beforeEachFns = this.beforeEachFns; this.setupBefore = function() { if (parent) parent.setupBefore.call(this); - angular.foreach(beforeEachFns, function(fn) { fn.call(this); }, this); + angular.forEach(beforeEachFns, function(fn) { fn.call(this); }, this); }; /** @@ -29,7 +29,7 @@ angular.scenario.Describe = function(descName, parent) { */ var afterEachFns = this.afterEachFns; this.setupAfter = function() { - angular.foreach(afterEachFns, function(fn) { fn.call(this); }, this); + angular.forEach(afterEachFns, function(fn) { fn.call(this); }, this); if (parent) parent.setupAfter.call(this); }; }; @@ -133,14 +133,14 @@ angular.scenario.Describe.prototype.xit = angular.noop; */ angular.scenario.Describe.prototype.getSpecs = function() { var specs = arguments[0] || []; - angular.foreach(this.children, function(child) { + angular.forEach(this.children, function(child) { child.getSpecs(specs); }); - angular.foreach(this.its, function(it) { + angular.forEach(this.its, function(it) { specs.push(it); }); var only = []; - angular.foreach(specs, function(it) { + angular.forEach(specs, function(it) { if (it.only) { only.push(it); } diff --git a/src/scenario/ObjectModel.js b/src/scenario/ObjectModel.js index e9125e03..263aa5f9 100644 --- a/src/scenario/ObjectModel.js +++ b/src/scenario/ObjectModel.js @@ -19,7 +19,7 @@ angular.scenario.ObjectModel = function(runner) { runner.on('SpecBegin', function(spec) { var block = self.value; - angular.foreach(self.getDefinitionPath(spec), function(def) { + angular.forEach(self.getDefinitionPath(spec), function(def) { if (!block.children[def.name]) { block.children[def.name] = { id: def.id, diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js index f628eb04..583c8beb 100644 --- a/src/scenario/Runner.js +++ b/src/scenario/Runner.js @@ -16,7 +16,7 @@ angular.scenario.Runner = function($window) { beforeEach: this.beforeEach, afterEach: this.afterEach }; - angular.foreach(this.api, angular.bind(this, function(fn, key) { + angular.forEach(this.api, angular.bind(this, function(fn, key) { this.$window[key] = angular.bind(this, fn); })); }; @@ -33,7 +33,7 @@ angular.scenario.Runner.prototype.emit = function(eventName) { eventName = eventName.toLowerCase(); if (!this.listeners[eventName]) return; - angular.foreach(this.listeners[eventName], function(listener) { + angular.forEach(this.listeners[eventName], function(listener) { listener.apply(self, args); }); }; @@ -164,17 +164,17 @@ angular.scenario.Runner.prototype.run = function(application) { asyncForEach(this.rootDescribe.getSpecs(), function(spec, specDone) { var dslCache = {}; var runner = self.createSpecRunner_($root); - angular.foreach(angular.scenario.dsl, function(fn, key) { + angular.forEach(angular.scenario.dsl, function(fn, key) { dslCache[key] = fn.call($root); }); - angular.foreach(angular.scenario.dsl, function(fn, key) { + angular.forEach(angular.scenario.dsl, function(fn, key) { self.$window[key] = function() { var line = callerFile(3); var scope = angular.scope(runner); // Make the dsl accessible on the current chain scope.dsl = {}; - angular.foreach(dslCache, function(fn, key) { + angular.forEach(dslCache, function(fn, key) { scope.dsl[key] = function() { return dslCache[key].apply(scope, arguments); }; diff --git a/src/scenario/Scenario.js b/src/scenario/Scenario.js index a2926b5b..d1f1eb33 100644 --- a/src/scenario/Scenario.js +++ b/src/scenario/Scenario.js @@ -38,7 +38,7 @@ angular.scenario.dsl = angular.scenario.dsl || function(name, fn) { return result; var self = this; var chain = angular.extend({}, result); - angular.foreach(chain, function(value, name) { + angular.forEach(chain, function(value, name) { if (angular.isFunction(value)) { chain[name] = function() { return executeStatement.call(self, value, arguments); @@ -101,7 +101,7 @@ function angularScenarioInit($scenario, config) { output = config.scenario_output.split(','); } - angular.foreach(angular.scenario.output, function(fn, name) { + angular.forEach(angular.scenario.output, function(fn, name) { if (!output.length || indexOf(output,name) != -1) { var context = body.append('<div></div>').find('div:last'); context.attr('id', name); diff --git a/src/scenario/SpecRunner.js b/src/scenario/SpecRunner.js index f3bbe2e6..0e068f95 100644 --- a/src/scenario/SpecRunner.js +++ b/src/scenario/SpecRunner.js @@ -112,7 +112,7 @@ angular.scenario.SpecRunner.prototype.addFutureAction = function(name, behavior, var args = Array.prototype.slice.call(arguments, 1); selector = (self.selector || '') + ' ' + (selector || ''); selector = _jQuery.trim(selector) || '*'; - angular.foreach(args, function(value, index) { + angular.forEach(args, function(value, index) { selector = selector.replace('$' + (index + 1), value); }); var result = $document.find(selector); diff --git a/src/scenario/dsl.js b/src/scenario/dsl.js index 2ba61a52..4f967772 100644 --- a/src/scenario/dsl.js +++ b/src/scenario/dsl.js @@ -331,7 +331,7 @@ angular.scenario.dsl('element', function() { }); }; - angular.foreach(KEY_VALUE_METHODS, function(methodName) { + angular.forEach(KEY_VALUE_METHODS, function(methodName) { chain[methodName] = function(name, value) { var futureName = "element '" + this.label + "' get " + methodName + " '" + name + "'"; if (angular.isDefined(value)) { @@ -344,7 +344,7 @@ angular.scenario.dsl('element', function() { }; }); - angular.foreach(VALUE_METHODS, function(methodName) { + angular.forEach(VALUE_METHODS, function(methodName) { chain[methodName] = function(value) { var futureName = "element '" + this.label + "' " + methodName; if (angular.isDefined(value)) { diff --git a/src/scenario/output/Html.js b/src/scenario/output/Html.js index 4a682b9a..6e2e20f3 100644 --- a/src/scenario/output/Html.js +++ b/src/scenario/output/Html.js @@ -121,7 +121,7 @@ angular.scenario.output('html', function(context, runner) { */ function findContext(spec) { var currentContext = context.find('#specs'); - angular.foreach(model.getDefinitionPath(spec), function(defn) { + angular.forEach(model.getDefinitionPath(spec), function(defn) { var id = 'describe-' + defn.id; if (!context.find('#' + id).length) { currentContext.find('> .test-children').append( diff --git a/src/scenario/output/Xml.js b/src/scenario/output/Xml.js index cbc55ee7..e8c7f0e3 100644 --- a/src/scenario/output/Xml.js +++ b/src/scenario/output/Xml.js @@ -17,7 +17,7 @@ angular.scenario.output('xml', function(context, runner) { * @param {Object} tree node to serialize */ function serializeXml(context, tree) { - angular.foreach(tree.children, function(child) { + angular.forEach(tree.children, function(child) { var describeContext = $('<describe></describe>'); describeContext.attr('id', child.id); describeContext.attr('name', child.name); @@ -26,14 +26,14 @@ angular.scenario.output('xml', function(context, runner) { }); var its = $('<its></its>'); context.append(its); - angular.foreach(tree.specs, function(spec) { + angular.forEach(tree.specs, function(spec) { var it = $('<it></it>'); it.attr('id', spec.id); it.attr('name', spec.name); it.attr('duration', spec.duration); it.attr('status', spec.status); its.append(it); - angular.foreach(spec.steps, function(step) { + angular.forEach(spec.steps, function(step) { var stepContext = $('<step></step>'); stepContext.attr('name', step.name); stepContext.attr('duration', step.duration); |
