migrate visitable to action

san650 · May 10, 2020 · f5b582b · f5b582b
1 parent 692eb0d
commit f5b582b
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 49 deletions.
diff --git a/addon-test-support/-private/execution_context/acceptance.js b/addon-test-support/-private/execution_context/acceptance.js
@@ -1,5 +1,4 @@
 import $ from '-jquery';
-import { run } from '../action';
 import {
   fillElement,
   assertFocusable
@@ -20,10 +19,6 @@ AcceptanceExecutionContext.prototype = {
     });
   },
 
-  runAsync(cb) {
-    return run(this.pageObjectNode, {}, cb);
-  },
-
   visit(path) {
     /* global visit */
     visit(path);

diff --git a/addon-test-support/-private/execution_context/integration.js b/addon-test-support/-private/execution_context/integration.js
@@ -1,6 +1,5 @@
 import $ from '-jquery';
 import { run } from '@ember/runloop';
-import { run as runAction } from '../action';
 import {
   fillElement,
   assertFocusable
@@ -28,10 +27,6 @@ IntegrationExecutionContext.prototype = {
     return wait();
   },
 
-  runAsync(cb) {
-    return runAction(this.pageObjectNode, {}, cb);
-  },
-
   visit() {},
 
   click(element) {

diff --git a/addon-test-support/-private/execution_context/native-events-context.js b/addon-test-support/-private/execution_context/native-events-context.js
@@ -6,7 +6,6 @@ import {
   blur
 } from 'ember-native-dom-helpers';
 
-import { run } from '../action';
 import {
   fillElement,
   assertFocusable
@@ -27,10 +26,6 @@ ExecutionContext.prototype = {
       '#ember-testing';
   },
 
-  runAsync(cb) {
-    return run(this.pageObjectNode, {}, cb);
-  },
-
   click(element) {
     click(element);
   },

diff --git a/addon-test-support/-private/execution_context/rfc268.js b/addon-test-support/-private/execution_context/rfc268.js
@@ -1,4 +1,3 @@
-import { run } from '../action';
 import {
   getRootElement,
   visit,
@@ -19,10 +18,6 @@ ExecutionContext.prototype = {
     return getRootElement();
   },
 
-  runAsync(cb) {
-    return run(this.pageObjectNode, {}, cb);
-  },
-
   visit(path) {
     return visit(path);
   },

diff --git a/addon-test-support/properties/visitable.js b/addon-test-support/properties/visitable.js
@@ -1,5 +1,5 @@
 import { assign } from '../-private/helpers';
-import { getExecutionContext } from '../-private/execution_context';
+import action from '../-private/action'
 
 import $ from '-jquery';
 
@@ -90,22 +90,12 @@ function appendQueryParams(path, queryParams) {
  * @throws Will throw an error if dynamic segments are not filled
  */
 export function visitable(path) {
-  return {
-    isDescriptor: true,
+  return action(function(dynamicSegmentsAndQueryParams = {}) {
+    let params = assign({}, dynamicSegmentsAndQueryParams);
+    let fullPath = fillInDynamicSegments(path, params);
 
-    get() {
-      return function(dynamicSegmentsAndQueryParams = {}) {
-        let executionContext = getExecutionContext(this);
+    fullPath = appendQueryParams(fullPath, params);
 
-        return executionContext.runAsync((context) => {
-          let params = assign({}, dynamicSegmentsAndQueryParams);
-          let fullPath = fillInDynamicSegments(path, params);
-
-          fullPath = appendQueryParams(fullPath, params);
-
-          return context.visit(fullPath);
-        });
-      }
-    }
-  };
+    return this.visit(fullPath);
+  });
 }
diff --git a/tests/unit/-private/properties/visitable-test.ts b/tests/unit/-private/properties/visitable-test.ts
@@ -27,19 +27,12 @@ moduleForProperty('visitable', { needsVisit: true }, function(test) {
   });
 
   test("raises an exception if params aren't given for all dynamic segments", async function(assert) {
-    assert.expect(1);
-
-    let page;
-
-    try {
-      page = create({
-        foo: visitable('/users/:user_id')
-      });
+    let page = create({
+      foo: visitable('/users/:user_id')
+    });
 
-      await this.adapter.await(page.foo());
-    } catch(e) {
-      assert.equal(e.message, "Missing parameter for 'user_id'");
-    }
+    this.adapter.throws(assert, () => page.foo(), /Missing parameter for \'user_id\'/);
+    this.adapter.throws(assert, () => page.foo(), /page\.foo\(\)/);
   });
 
   test('appends query params to the path', async function(assert) {