fix(strict mode): fix all issues discovered by strict mode and unit/e2e tests

4 files changed, 19 insertions, 21 deletions

diff --git a/test/scenario/output/HtmlSpec.js b/test/scenario/output/HtmlSpec.js
index a1ebef39..1cfa268e 100644
--- a/test/scenario/output/HtmlSpec.js
+++ b/test/scenario/output/HtmlSpec.js
@@ -1,6 +1,5 @@
 describe('angular.scenario.output.html', function() {
-  var runner, model, spec, listeners;
-  var ui, context;
+  var runner, model, spec, step, listeners, ui, context;
 
   beforeEach(function() {
     listeners = [];
diff --git a/test/service/deferSpec.js b/test/service/deferSpec.js
index bd8fe7d7..21b8bf9c 100644
--- a/test/service/deferSpec.js
+++ b/test/service/deferSpec.js
@@ -40,31 +40,31 @@ describe('$defer', function() {
 
 
   it('should call eval after each callback is executed', function() {
-    var eval = this.spyOn(scope, '$eval').andCallThrough();
+    var evalSpy = this.spyOn(scope, '$eval').andCallThrough();
 
     $defer(function() {});
-    expect(eval).not.toHaveBeenCalled();
+    expect(evalSpy).not.toHaveBeenCalled();
 
     $browser.defer.flush();
-    expect(eval).toHaveBeenCalled();
+    expect(evalSpy).toHaveBeenCalled();
 
-    eval.reset(); //reset the spy;
+    evalSpy.reset(); //reset the spy;
 
     $defer(function() {});
     $defer(function() {});
     $browser.defer.flush();
-    expect(eval.callCount).toBe(2);
+    expect(evalSpy.callCount).toBe(2);
   });
 
 
   it('should call eval even if an exception is thrown in callback', function() {
-    var eval = this.spyOn(scope, '$eval').andCallThrough();
+    var evalSpy = this.spyOn(scope, '$eval').andCallThrough();
 
     $defer(function() {throw "Test Error";});
-    expect(eval).not.toHaveBeenCalled();
+    expect(evalSpy).not.toHaveBeenCalled();
 
     $browser.defer.flush();
-    expect(eval).toHaveBeenCalled();
+    expect(evalSpy).toHaveBeenCalled();
   });
 
   it('should allow you to specify the delay time', function(){
diff --git a/test/service/xhr.cacheSpec.js b/test/service/xhr.cacheSpec.js
index ecaebc3f..4d3e3e08 100644
--- a/test/service/xhr.cacheSpec.js
+++ b/test/service/xhr.cacheSpec.js
@@ -124,21 +124,21 @@ describe('$xhr.cache', function() {
 
 
   it('should call eval after callbacks for both cache hit and cache miss execute', function() {
-    var eval = this.spyOn(scope, '$eval').andCallThrough();
+    var evalSpy = this.spyOn(scope, '$eval').andCallThrough();
 
     $browserXhr.expectGET('/url').respond('+');
     cache('GET', '/url', null, callback);
-    expect(eval).not.toHaveBeenCalled();
+    expect(evalSpy).not.toHaveBeenCalled();
 
     $browserXhr.flush();
-    expect(eval).toHaveBeenCalled();
+    expect(evalSpy).toHaveBeenCalled();
 
-    eval.reset(); //reset the spy
+    evalSpy.reset(); //reset the spy
 
     cache('GET', '/url', null, callback);
-    expect(eval).not.toHaveBeenCalled();
+    expect(evalSpy).not.toHaveBeenCalled();
 
     $browser.defer.flush();
-    expect(eval).toHaveBeenCalled();
+    expect(evalSpy).toHaveBeenCalled();
   });
 });
diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js
index 34e1710b..375e01c7 100644
--- a/test/testabilityPatch.js
+++ b/test/testabilityPatch.js
@@ -8,7 +8,7 @@ _jQuery.event.special.change = undefined;
 
 
 if (window.jstestdriver) {
-  jstd = jstestdriver;
+  window.jstd = jstestdriver;
   window.dump = function(){
     var args = [];
     forEach(arguments, function(arg){
@@ -175,8 +175,7 @@ extend(angular, {
   'isFunction': isFunction,
   'isObject': isObject,
   'isNumber': isNumber,
-  'isArray': isArray,
-  'forEach': forEach
+  'isArray': isArray
 });
 
 
@@ -317,8 +316,8 @@ function assertThrows(error, fn){
   assertEquals(error, exception);
 }
 
-log = noop;
-error = noop;
+window.log = noop;
+window.error = noop;
 
 function rethrow(e) {
   if(e) {