Merge branch 'master' of github.com:cibernox/ember-power-select

cibernox · Mar 24, 2020 · d30e5fd · d30e5fd
2 parents dc6a8e2 + 3f5e014
commit d30e5fd
Show file tree

Hide file tree

Showing 4 changed files with 645 additions and 650 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -46,7 +46,6 @@ jobs:
 
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
-    - env: EMBER_TRY_SCENARIO=ember-3.13
     - env: EMBER_TRY_SCENARIO=ember-lts-3.16
     - env: EMBER_TRY_SCENARIO=ember-release
     - env: EMBER_TRY_SCENARIO=ember-beta

diff --git a/addon/components/power-select.ts b/addon/components/power-select.ts
@@ -197,7 +197,7 @@ export default class PowerSelect extends Component<PowerSelectArgs> {
     if (this._resolvedSelected) {
       return toPlainArray(this._resolvedSelected);
     } else if (this.args.selected && typeof this.args.selected.then !== 'function') {
-      return this.args.selected;
+      return toPlainArray(this.args.selected);
     }
     return undefined;
   }

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -6,14 +6,6 @@ module.exports = async function() {
   return {
     useYarn: true,
     scenarios: [
-      {
-        name: 'ember-3.13',
-        npm: {
-          devDependencies: {
-            'ember-source': '~3.13.0'
-          }
-        }
-      },
       {
         name: 'ember-lts-3.16',
         npm: {