Clean up a bunch of spec global variable leaks

Also some formatting changes to highlight when using one 'var' with comma operator

spec/core/EnvSpec.js

@@ -6,7 +6,7 @@ describe("Env", function() {
   });
 
   it('removes all spies when env is executed', function(done) {
-    originalFoo = function() {},
+    var originalFoo = function() {},
       testObj = {
         foo: originalFoo
       },

spec/core/ExceptionsSpec.js

@@ -35,7 +35,7 @@ describe('Exceptions:', function() {
         env.it('should be a passing test that runs after exceptions are thrown from a async test', secondTest);
       });
 
-      expectations = function() {
+      var expectations = function() {
         expect(secondTest).toHaveBeenCalled();
         done();
       };
@@ -55,7 +55,7 @@ describe('Exceptions:', function() {
       });
       env.describe("a suite that doesn't throw an exception", secondDescribe);
 
-      expectations = function() {
+      var expectations = function() {
         expect(secondDescribe).toHaveBeenCalled();
         done();
       };

spec/core/QueueRunnerSpec.js

@@ -129,8 +129,7 @@ describe("QueueRunner", function() {
 
   it("continues running the functions even after an exception is thrown in an async spec", function() {
     var fn = function(done) { throw new Error("error"); },
-        nextFn = jasmine.createSpy("nextFunction");
+      nextFn = jasmine.createSpy("nextFunction"),
-
       queueRunner = new j$.QueueRunner({
         fns: [fn, nextFn]
       });

spec/core/matchers/toBeGreaterThanSpec.js

@@ -8,7 +8,8 @@ describe("toBeGreaterThan", function() {
   });
 
   it("fails when actual <= expected", function() {
-    var matcher = j$.matchers.toBeGreaterThan();
+    var matcher = j$.matchers.toBeGreaterThan(),
+      result;
 
     result = matcher.compare(1, 1);
     expect(result.pass).toBe(false);

spec/core/matchers/toBeNaNSpec.js

@@ -9,7 +9,8 @@ describe("toBeNaN", function() {
   });
 
   it("fails for anything not a NaN", function() {
-    var matcher = j$.matchers.toBeNaN();
+    var matcher = j$.matchers.toBeNaN(),
+      result;
 
     result = matcher.compare(1);
     expect(result.pass).toBe(false);

spec/core/matchers/toBeUndefinedSpec.js

@@ -9,7 +9,8 @@ describe("toBeUndefined", function() {
   });
 
   it("fails when matching defined values", function() {
-    var matcher = j$.matchers.toBeUndefined();
+    var matcher = j$.matchers.toBeUndefined(),
+      result;
 
     result = matcher.compare('foo');
     expect(result.pass).toBe(false);

spec/core/matchers/toContainSpec.js

@@ -3,7 +3,8 @@ describe("toContain", function() {
     var util = {
         contains: jasmine.createSpy('delegated-contains').and.returnValue(true)
       },
-      matcher = j$.matchers.toContain(util);
+      matcher = j$.matchers.toContain(util),
+      result;
 
     result = matcher.compare("ABC", "B");
     expect(util.contains).toHaveBeenCalledWith("ABC", "B", []);
@@ -15,7 +16,8 @@ describe("toContain", function() {
         contains: jasmine.createSpy('delegated-contains').and.returnValue(true)
       },
       customEqualityTesters = ['a', 'b'],
-      matcher = j$.matchers.toContain(util, customEqualityTesters);
+      matcher = j$.matchers.toContain(util, customEqualityTesters),
+      result;
 
     result = matcher.compare("ABC", "B");
     expect(util.contains).toHaveBeenCalledWith("ABC", "B", ['a', 'b']);

spec/core/matchers/toHaveBeenCalledSpec.js

@@ -13,7 +13,8 @@ describe("toHaveBeenCalled", function() {
 
   it("fails when the actual was not called", function() {
     var matcher = j$.matchers.toHaveBeenCalled(),
-      uncalledSpy = j$.createSpy('uncalled spy');
+      uncalledSpy = j$.createSpy('uncalled spy'),
+      result;
 
     result = matcher.compare(uncalledSpy);
     expect(result.pass).toBe(false);

spec/html/HtmlReporterSpec.js

@@ -326,7 +326,7 @@ describe("New HtmlReporter", function() {
       beforeEach(function() {
         env = new j$.Env();
         container = document.createElement("div");
-        getContainer = function() { return container; },
+        var getContainer = function() { return container; },
           reporter = new j$.HtmlReporter({
             env: env,
             getContainer: getContainer,
@@ -377,7 +377,7 @@ describe("New HtmlReporter", function() {
       beforeEach(function() {
         env = new j$.Env();
         container = document.createElement("div");
-        getContainer = function() { return container; },
+        var getContainer = function() { return container; };
         reporter = new j$.HtmlReporter({
           env: env,
           getContainer: getContainer,
@@ -414,8 +414,8 @@ describe("New HtmlReporter", function() {
 
       beforeEach(function() {
         env = new j$.Env();
-        container = document.createElement("div"),
+        container = document.createElement("div");
-        getContainer = function() { return container; },
+        var getContainer = function() { return container; }
         reporter = new j$.HtmlReporter({
           env: env,
           getContainer: getContainer,