Fix remaining review findings

Author: brianmhunt

builds/knockout/spec/defaultBindings/valueBehaviors.js

@@ -151,8 +151,8 @@ describe('Binding: Value', function() {
         expect(mySetter.set).to.deep.equal('668');
 
         // ['property']
-        testNode.childNodes[0].value = 669;
-        ko.utils.triggerEvent(testNode.childNodes[0], "change");
+        testNode.childNodes[2].value = 669;
+        ko.utils.triggerEvent(testNode.childNodes[2], "change");
         expect(mySetter.set).to.deep.equal('669');
     });
 

builds/knockout/spec/dependentObservableBehaviors.js

@@ -70,7 +70,7 @@ describe('Dependent Observable', function() {
         var someContainer = { depObs: instance };
         someContainer.depObs("some value");
         expect(invokedWriteWithValue).to.deep.equal("some value");
-        expect(invokedWriteWithThis).to.deep.equal(function(){return this;}.call()); // Since no owner was specified
+        expect(invokedWriteWithThis).to.equal(function(){return this;}.call()); // Since no owner was specified
     });
 
     it('Should be able to write to multiple computed properties on a model object using chaining syntax', function() {
@@ -112,7 +112,7 @@ describe('Dependent Observable', function() {
         expect(invokedWriteWithArgs[0]).to.deep.equal("first");
         expect(invokedWriteWithArgs[1]).to.deep.equal(2);
         expect(invokedWriteWithArgs[2]).to.deep.equal(["third1", "third2"]);
-        expect(invokedWriteWithThis).to.deep.equal(someOwner);
+        expect(invokedWriteWithThis).to.equal(someOwner);
     });
 
     it('Should use the second arg (evaluatorFunctionTarget) for "this" when calling read/write if no options.owner was given', function() {
@@ -124,8 +124,8 @@ describe('Dependent Observable', function() {
 
         instance("force invocation of write");
 
-        expect(actualReadThis).to.deep.equal(expectedThis);
-        expect(actualWriteThis).to.deep.equal(expectedThis);
+        expect(actualReadThis).to.equal(expectedThis);
+        expect(actualWriteThis).to.equal(expectedThis);
     });
 
     it('Should be able to pass evaluator function using "options" parameter called "read"', function() {

builds/knockout/spec/templatingBehaviors.js

@@ -55,17 +55,20 @@ export var dummyTemplateEngine = function (templates) {
 
         templateText = options.showParams ? templateText + ", data=" + data + ", options=" + options : templateText;
         var templateOptions = options.templateOptions; // Have templateOptions in scope to support [js:templateOptions.foo] syntax
-
-        data = data || {};
-        var nomangle$data = data;
+        var renderData = data == null ? {} : data;
+        var nomangle$data = renderData;
         window.__prevent_tree_shaking__ = nomangle$data;
         delete window.__prevent_tree_shaking__;
 
-        options.templateRenderingVariablesInScope = options.templateRenderingVariablesInScope || {};
-        ko.utils.extend(data, options.templateRenderingVariablesInScope);
+        var templateRenderingVariablesInScope = options.templateRenderingVariablesInScope || {};
+        var scopeData = {};
+        if (renderData && (typeof renderData === 'object' || typeof renderData === 'function')) {
+            ko.utils.extend(scopeData, renderData);
+        }
+        ko.utils.extend(scopeData, templateRenderingVariablesInScope);
 
         var result = templateText.replace(/\[renderTemplate\:(.*?)\]/g, function (match, templateName) {
-            return ko.renderTemplate(templateName, data, options);
+            return ko.renderTemplate(templateName, renderData, options);
         });
 
         result = result.replace(/\[\[js\:([\s\S]*?)\]\]/g, evalHandler);
@@ -78,10 +81,10 @@ export var dummyTemplateEngine = function (templates) {
                     bindingContext: bindingContext,
                     ko: ko,
                     nomangle$data: nomangle$data,
-                    root: data,
+                    root: renderData,
                     templateOptions: templateOptions,
                     unwrap: ko.utils.unwrapObservable
-                }, bindingContext, data, options.templateRenderingVariablesInScope);
+                }, bindingContext, scopeData);
                 with (scope) {
                     evalResult = eval(script);
                 }

packages/bind/spec/asyncBindingBehaviors.ts

@@ -61,12 +61,16 @@ describe('Deferred bindings', function () {
     }
   })
   afterEach(function () {
-    expect(tasks.resetForTesting()).to.equal(0)
-    while (cleanups.length) {
-      cleanups.pop()!()
+    const pendingTasks = tasks.resetForTesting()
+    try {
+      while (cleanups.length) {
+        cleanups.pop()!()
+      }
+    } finally {
+      clock.restore()
+      bindingSpy = bindingHandlers.test = null
     }
-    clock.restore()
-    bindingSpy = bindingHandlers.test = null
+    expect(pendingTasks).to.equal(0)
   })
 
   it('Should update bindings asynchronously', function () {

packages/bind/spec/bindingAttributeBehaviors.ts

@@ -25,7 +25,12 @@ import { bindings as coreBindings } from '@tko/binding.core'
 import { bindings as templateBindings } from '@tko/binding.template'
 import { bindings as ifBindings } from '@tko/binding.if'
 
-import { expectContainHtml, expectContainText, prepareTestNode, restoreAfter } from '../../utils/helpers/mocha-test-helpers'
+import {
+  expectContainHtml,
+  expectContainText,
+  prepareTestNode,
+  restoreAfter
+} from '../../utils/helpers/mocha-test-helpers'
 import { Provider } from '@tko/provider'
 
 describe('Binding attribute syntax', function () {
@@ -392,9 +397,7 @@ describe('Binding attribute syntax', function () {
     testNode.innerHTML = "<div data-bind='test1: true, test2: true'></div>"
     expect(function () {
       applyBindings(null, testNode)
-    }).to.throw(
-      'Multiple bindings (test1 and test2) are trying to control descendant bindings of the same element.'
-    )
+    }).to.throw('Multiple bindings (test1 and test2) are trying to control descendant bindings of the same element.')
   })
 
   it('Should use properties on the view model in preference to properties on the binding context', function () {

packages/bind/spec/bindingHandlerBehaviors.ts

@@ -102,7 +102,7 @@ describe('BindingHandler behaviors', function () {
           this.subscribe(obs, this.cb)
         }
         cb() {
-        expect(this).to.equal(handlerInstance)
+          expect(this).to.equal(handlerInstance)
         }
       }
       testNode.innerHTML = "<i data-bind='fnHandler'></i>"