From 5bca55b6444ded62e6cec5b876a9035e46b274af Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Fri, 7 Aug 2015 15:20:34 -0700
Subject: [PATCH] Add tests. Reset selection on items/multi change. Remove
 async.

---
 src/lib/template/array-selector.html   |  21 +--
 test/runner.html                       |   1 +
 test/unit/array-selector-elements.html |  11 ++
 test/unit/array-selector.html          | 218 +++++++++++++++++++++++++
 4 files changed, 237 insertions(+), 14 deletions(-)
 create mode 100644 test/unit/array-selector-elements.html
 create mode 100644 test/unit/array-selector.html
diff --git a/src/lib/template/array-selector.html b/src/lib/template/array-selector.html
index 5e30a7c7a8..ec3011e381 100644
--- a/src/lib/template/array-selector.html
+++ b/src/lib/template/array-selector.html
@@ -73,7 +73,8 @@
        * An array containing items from which selection will be made.
        */
       items: {
-        type: Array
+        type: Array,
+        observer: '_resetSelection'
       },
 
       /**
@@ -99,15 +100,11 @@
        */
       multi: {
         type: Boolean,
-        value: false
+        observer: '_resetSelection'
       }
     },
 
-    observers: [
-      '_itemsChanged(items, multi)'
-    ],
-
-    _itemsChanged: function(items, multi) {
+    _resetSelection: function() {
       // Unbind previous selection
       if (Array.isArray(this.selected)) {
         for (var i=0; i<this.selected.length; i++) {
@@ -117,7 +114,7 @@
         this.unlinkPaths('selected');
       }
       // Initialize selection
-      if (multi) {
+      if (this.multi) {
         this.selected = [];
       } else {
         this.selected = null;
@@ -163,12 +160,8 @@
           }
         } else {
           this.push('selected', item);
-          // this.linkPaths('selected.' + sidx, 'items.' + skey);
-          // skey = Polymer.Collection.get(this.selected).add(item);
-          this.async(function() {
-            skey = scol.getKey(item);
-            this.linkPaths('selected.' + skey, 'items.' + key);
-          });
+          skey = scol.getKey(item);
+          this.linkPaths('selected.' + skey, 'items.' + key);
         }
       } else {
         if (this.toggle && item == this.selected) {
diff --git a/test/runner.html b/test/runner.html
index 98c5616165..61aacd60e3 100644
--- a/test/runner.html
+++ b/test/runner.html
@@ -35,6 +35,7 @@
       'unit/bind.html',
       'unit/bind.html?dom=shadow',
       'unit/notify-path.html',
+      'unit/array-selector.html',
       'unit/events.html',
       'unit/gestures.html',
       'unit/utils.html',
diff --git a/test/unit/array-selector-elements.html b/test/unit/array-selector-elements.html
new file mode 100644
index 0000000000..a0ad83f980
--- /dev/null
+++ b/test/unit/array-selector-elements.html
@@ -0,0 +1,11 @@
+<script>
+Polymer({
+  is: 'observe-el',
+  observers: [
+    'singleChanged(singleSelected.*)',
+    'multiChanged(multiSelected.*)'
+  ],
+  singleChanged: function() {},
+  multiChanged: function() {}
+});
+</script>
diff --git a/test/unit/array-selector.html b/test/unit/array-selector.html
new file mode 100644
index 0000000000..31ee18f2d3
--- /dev/null
+++ b/test/unit/array-selector.html
@@ -0,0 +1,218 @@
+<!doctype html>
+<!--
+@license
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+<head>
+  <meta charset="utf-8">
+  <script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../../../web-component-tester/browser.js"></script>
+  <link rel="import" href="../../polymer.html">
+  <link rel="import" href="array-selector-elements.html">
+<body>
+
+<array-selector id="singleConfigured"
+  items='[{"name": "one"},{"name": "two"},{"name": "three"}]'>
+</array-selector>
+
+<array-selector id="multiConfigured" multi
+  items='[{"name": "one"},{"name": "two"},{"name": "three"}]'>
+</array-selector>
+
+<template is="dom-bind" id="bind">
+  <observe-el id="observer" single-selected="{{singleSelected}}" multi-selected="{{multiSelected}}"></observe-el>
+  <array-selector id="singleBound" items="{{items}}" selected="{{singleSelected}}"></array-selector>
+  <array-selector id="multiBound" items="{{items}}" selected="{{multiSelected}}" multi></array-selector>
+</template>
+
+<script>
+suite('basic', function() {
+
+  test('single selection', function() {
+    var el = singleConfigured;
+    // Nothing selected
+    assert.strictEqual(el.selected, null);
+    // Select 0
+    el.select(el.items[0]);
+    assert.strictEqual(el.selected, el.items[0]);
+    // Re-select 0
+    el.select(el.items[0]);
+    assert.strictEqual(el.selected, el.items[0]);
+    // Select 2
+    el.select(el.items[2]);
+    assert.strictEqual(el.selected, el.items[2]);
+    // Toggle 2
+    el.toggle = true;
+    el.select(el.items[2]);
+    assert.strictEqual(el.selected, null);
+    // Toggle 2
+    el.toggle = true;
+    el.select(el.items[2]);
+    assert.strictEqual(el.selected, el.items[2]);
+  });
+
+  test('multiple selection', function() {
+    var el = multiConfigured;
+    // Nothing selected
+    assert.sameMembers(el.selected, []);
+    // Select 0
+    el.select(el.items[0]);
+    assert.sameMembers(el.selected, [el.items[0]]);
+    // Re-select 0
+    el.select(el.items[0]);
+    assert.sameMembers(el.selected, [el.items[0]]);
+    // Select 2
+    el.select(el.items[2]);
+    assert.sameMembers(el.selected, [el.items[0], el.items[2]]);
+    // Toggle 2
+    el.toggle = true;
+    el.select(el.items[2]);
+    assert.sameMembers(el.selected, [el.items[0]]);
+    // Toggle 2
+    el.toggle = true;
+    el.select(el.items[2]);
+    assert.sameMembers(el.selected, [el.items[0], el.items[2]]);
+  });
+
+  test('bound defaults', function() {
+    assert.equal(bind.$.observer.singleSelected, null);
+    assert.sameMembers(bind.$.observer.multiSelected, []);
+    bind.items = [
+      {name: 'one'},
+      {name: 'two'},
+      {name: 'three'}
+    ];
+    assert.equal(bind.$.observer.singleSelected, null);
+    assert.sameMembers(bind.$.observer.multiSelected, []);
+  });
+
+  test('single selection notification', function() {
+    bind.items = [
+      {name: 'one'},
+      {name: 'two'},
+      {name: 'three'}
+    ];
+    var called = false;
+    observer.singleChanged = function(info) {
+      called = true;
+      assert.equal(info.path, 'singleSelected');
+      assert.equal(info.value, bind.items[2]);
+      assert.equal(bind.$.observer.singleSelected, bind.items[2]);
+    };
+    singleBound.select(bind.items[2]);
+    assert.equal(called, true);
+    observer.singleChanged = function(info) {};
+  });
+
+  test('single selection sub-property change', function() {
+    var called = false;
+    observer.singleChanged = function(info) {
+      called = true;
+      assert.equal(info.path, 'singleSelected.name');
+      assert.equal(info.value, 'test');
+      assert.equal(bind.$.observer.singleSelected.name, 'test');
+    };
+    bind.set(['items', 2, 'name'], 'test');
+    assert.equal(called, true);
+    observer.singleChanged = function(info) {};
+  });
+
+  test('single selection sub-property change after unshift', function() {
+    var called = false;
+    observer.singleChanged = function(info) {
+      called = true;
+      assert.equal(info.path, 'singleSelected.name');
+      assert.equal(info.value, 'test2');
+      assert.equal(bind.$.observer.singleSelected.name, 'test2');
+    };
+    bind.unshift('items', {name: 'zero'});
+    bind.set(['items', 3, 'name'], 'test2');
+    assert.equal(called, true);
+    observer.singleChanged = function(info) {};
+  });
+
+  test('multi selection notification', function() {
+    bind.items = [
+      {name: 'one'},
+      {name: 'two'},
+      {name: 'three'}
+    ];
+    var called = false;
+    observer.multiChanged = function(info) {
+      if (info.path == 'multiSelected.length') {
+        assert.equal(info.value, 1);
+      } else {
+        called = true;
+        assert.equal(info.path, 'multiSelected.splices');
+        assert.equal(info.value.keySplices.length, 1);
+        assert.equal(info.value.keySplices[0].added.length, 1);
+        assert.equal(info.value.keySplices[0].added[0], 0);
+        assert.equal(info.value.keySplices[0].removed.length, 0);
+        assert.sameMembers(bind.$.observer.multiSelected, [bind.items[2]]);
+      }
+    };
+    multiBound.select(bind.items[2]);
+    called = false;
+    observer.multiChanged = function(info) {
+      called = true;
+      if (info.path == 'multiSelected.length') {
+        assert.equal(info.value, 2);
+      } else {
+        assert.equal(info.path, 'multiSelected.splices');
+        assert.equal(info.value.keySplices.length, 1);
+        assert.equal(info.value.keySplices[0].added.length, 1);
+        assert.equal(info.value.keySplices[0].added[0], 1);
+        assert.equal(info.value.keySplices[0].removed.length, 0);
+        assert.sameMembers(bind.$.observer.multiSelected, [bind.items[2], bind.items[0]]);
+      }
+    };
+    multiBound.select(bind.items[0]);
+    assert.equal(called, true);
+    observer.multiChanged = function(info) {};
+  });
+
+  test('multi selection sub-property change', function() {
+    var called = false;
+    observer.multiChanged = function(info) {
+      called = true;
+      assert.equal(info.path, 'multiSelected.0.name');
+      assert.equal(info.value, 'test');
+      assert.equal(bind.$.observer.multiSelected[0].name, 'test');
+    };
+    bind.set(['items', 2, 'name'], 'test');
+    observer.multiChanged = function(info) {
+      called = true;
+      assert.equal(info.path, 'multiSelected.1.name');
+      assert.equal(info.value, 'test2');
+      assert.equal(bind.$.observer.multiSelected[1].name, 'test2');
+    };
+    bind.set(['items', 0, 'name'], 'test2');
+    assert.equal(called, true);
+    observer.multiChanged = function(info) {};
+  });
+
+
+  test('multi selection sub-property change after unshift', function() {
+    var called = false;
+    observer.multiChanged = function(info) {
+      called = true;
+      assert.equal(info.path, 'multiSelected.1.name');
+      assert.equal(info.value, 'test3');
+      assert.equal(bind.$.observer.multiSelected[1].name, 'test3');
+    };
+    bind.unshift('items', {name: 'zero'});
+    bind.set(['items', 1, 'name'], 'test3');
+    assert.equal(called, true);
+  });
+
+});
+</script>
+
+</body>
+</html>
