fix: better test and logic

nolanlawson · Jul 26, 2021 · 4385bd0 · 4385bd0
1 parent aae0e72
commit 4385bd0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/picker/PickerElement.js b/src/picker/PickerElement.js
@@ -35,7 +35,7 @@ export default class PickerElement extends HTMLElement {
     }
     // Handle properties set before the element was upgraded
     for (const prop of PROPS) {
-      if (prop !== 'database' && typeof this[prop] !== 'undefined') {
+      if (prop !== 'database' && Object.hasOwnProperty.call(this, prop)) {
         this._ctx[prop] = this[prop]
       }
     }

diff --git a/test/spec/picker/upgrade.test.js b/test/spec/picker/upgrade.test.js
@@ -45,6 +45,10 @@ describe('upgrade tests', () => {
     expect(picker.locale).toEqual('fr')
     expect(picker.dataSource).toEqual(FR_EMOJI)
 
+    picker.skinToneEmoji = '✌'
+
+    await waitFor(() => expect(getByRole(container, 'menuitem', { name: /👍/ })).toBeVisible())
+
     document.body.removeChild(div)
     await tick(20)
   })