Merge pull request #638 from simonihmig/collection-preserve-getters

Support string getters within collections

addon/src/-private/helpers.js

@@ -209,3 +209,13 @@ export function findClosestValue(node, property) {
     return findClosestValue(parent, property);
   }
 }
+
+export function assignDescriptors(target, source) {
+  Object.getOwnPropertyNames(source).forEach((key) => {
+    const descriptor = Object.getOwnPropertyDescriptor(source, key);
+
+    Object.defineProperty(target, key, descriptor);
+  });
+
+  return target;
+}

addon/src/create.js

@@ -6,16 +6,7 @@ import {
 } from './-private/meta';
 import dsl from './-private/dsl';
 import { getter } from './macros/index';
-
-function assignDescriptors(target, source) {
-  Object.getOwnPropertyNames(source).forEach((key) => {
-    const descriptor = Object.getOwnPropertyDescriptor(source, key);
-
-    Object.defineProperty(target, key, descriptor);
-  });
-
-  return target;
-}
+import { assignDescriptors } from './-private/helpers';
 
 //
 // When running RFC268 tests, we have to play some tricks to support chaining.

addon/src/properties/collection.js

@@ -1,5 +1,5 @@
 import Ceibo from '@ro0gr/ceibo';
-import { buildSelector } from '../-private/helpers';
+import { buildSelector, assignDescriptors } from '../-private/helpers';
 import { isPageObject, getPageObjectDefinition } from '../-private/meta';
 import { create } from '../create';
 import { count } from './count';
@@ -199,7 +199,7 @@ export class Collection {
       let { scope, definition, parent } = this;
       let itemScope = buildSelector({}, scope, { at: index });
 
-      let finalizedDefinition = { ...definition };
+      let finalizedDefinition = assignDescriptors({}, definition);
 
       finalizedDefinition.scope = itemScope;
 

test-app/tests/integration/string-properties-test.ts

@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { create } from 'ember-cli-page-object';
+import { collection, create } from 'ember-cli-page-object';
 
 module('string-properties', function () {
   test('throws in top-level string property', function (assert) {
@@ -21,6 +21,21 @@ Key: "stringProp"`)
         }),
       new Error(`string values are not supported in page object definitions
 
+Key: "stringProp"`)
+    );
+  });
+
+  test('throws in collection string property', function (assert) {
+    const po = create({
+      items: collection('.items', {
+        stringProp: '',
+      }),
+    });
+
+    assert.throws(
+      () => po.items[0]?.stringProp,
+      new Error(`string values are not supported in page object definitions
+
 Key: "stringProp"`)
     );
   });
@@ -40,4 +55,38 @@ Key: "stringProp"`)
 
     assert.true(true);
   });
+
+  test('allows native getter', function (assert) {
+    const po = create({
+      get foo() {
+        return 'bar';
+      },
+    });
+
+    assert.strictEqual(po.foo, 'bar');
+  });
+
+  test('allows nested native getter', function (assert) {
+    const po = create({
+      nested: {
+        get foo() {
+          return 'bar';
+        },
+      },
+    });
+
+    assert.strictEqual(po.nested.foo, 'bar');
+  });
+
+  test('allows native getter in collection', function (assert) {
+    const po = create({
+      items: collection('.items', {
+        get foo() {
+          return 'bar';
+        },
+      }),
+    });
+
+    assert.strictEqual(po.items[0]?.foo, 'bar');
+  });
 });