From 85184e8b1a2f941cb9a949cc8447f554f0fde79a Mon Sep 17 00:00:00 2001
From: Kevin Schaaf <kschaaf@google.com>
Date: Tue, 18 Apr 2017 14:14:30 -0700
Subject: [PATCH] Fix test for fallback _readyClients. Fixes #4547

---
 lib/mixins/property-effects.html |  6 +++---
 test/unit/configure.html         | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/mixins/property-effects.html b/lib/mixins/property-effects.html
index 7241725d1f..355bc19989 100644
--- a/lib/mixins/property-effects.html
+++ b/lib/mixins/property-effects.html
@@ -1507,14 +1507,14 @@
       }
 
       /**
-       * Overrides PropertyAccessor
+       * Overrides `PropertyAccessors` to call `_readyClients` callback
+       * if it was not called as a result of flushing properties.
        *
        * @override
        */
       ready() {
-        let dataPending = this.__dataPending;
         super.ready();
-        if (!dataPending) {
+        if (!this.__dataClientsInitialized) {
           this._readyClients();
         }
       }
diff --git a/test/unit/configure.html b/test/unit/configure.html
index 21ce6d5269..8fc15928ce 100644
--- a/test/unit/configure.html
+++ b/test/unit/configure.html
@@ -296,9 +296,29 @@
     };
   </script>
 
+  <dom-module id="x-config-lazy-nodefaults">
+    <template>
+      <div>x-config-lazy-nodefaults</div>
+    </template>
+    <script>
+      window.XConfigLazyNoDefaults = {
+        is: 'x-config-lazy-nodefaults',
+        properties: {
+          prop: {
+            observer: 'propChanged'
+          }
+        },
+        created: function() {
+          this.propChanged = sinon.spy();
+        }
+      };
+    </script>
+  </dom-module>
+
   <dom-module id="x-config-lazy-host">
     <template>
       <x-config-lazy id="lazy" prop="{{foo}}" read-only-prop="{{foo}}" had-attr-prop="attrValue" bound-no-effect-prop="{{foo}}"></x-config-lazy>
+      <x-config-lazy-nodefaults prop="[[foo]]"></x-config-lazy-nodefaults>
     </template>
     <script>
     HTMLImports.whenReady(function() {
@@ -491,6 +511,7 @@
       var el = document.createElement('x-config-lazy-host');
       document.body.appendChild(el);
       Polymer(window.XConfigLazy);
+      Polymer(window.XConfigLazyNoDefaults);
       assert.equal(el.$.lazy.noEffectProp, 1);
       assert.equal(el.$.lazy.defaultUsesNoEffectProp, 2);
       assert.equal(el.$.lazy.boundNoEffectProp, 'foo');