Merge pull request #749 from adopted-ember-addons/fix-embroider

update @embroider/test-setup to fix CI

.github/workflows/ci.yml

@@ -70,8 +70,8 @@ jobs:
           - ember-release
           - ember-beta
           - ember-canary
-          # - embroider-safe
-          # - embroider-optimized
+          - embroider-safe
+          - embroider-optimized
 
     steps:
       - uses: actions/checkout@v4

addon/-private/options.js

@@ -1,5 +1,4 @@
 import EmberObject, { get } from '@ember/object';
-import { isDescriptor } from '../utils/utils';
 
 const { keys } = Object;
 const OPTION_KEYS = '__option_keys__';
@@ -18,11 +17,7 @@ export default class Options {
     const optionKeys = keys(options);
     const createParams = { [OPTION_KEYS]: optionKeys, model, attribute };
 
-    // If any of the options is a CP, we need to create a custom class for it
-    if (optionKeys.some((key) => isDescriptor(options[key]))) {
-      return OptionsObject.extend(options).create(createParams);
-    }
-
-    return OptionsObject.create(createParams, options);
+    // we have to extend here in case anyone passes options that have computedProperties.
+    return OptionsObject.extend(options).create(createParams);
   }
 }

package.json

@@ -60,7 +60,7 @@
     "@ember/optional-features": "^2.0.0",
     "@ember/string": "^3.0.1",
     "@ember/test-helpers": "^2.9.3",
-    "@embroider/test-setup": "^2.1.1",
+    "@embroider/test-setup": "^3.0.2",
     "@fortawesome/ember-fontawesome": "^1.0.0",
     "@fortawesome/fontawesome-svg-core": "^6.5.1",
     "@fortawesome/free-brands-svg-icons": "^6.4.0",