chore: remove usage of rsvp promises

projectcaluma · Sep 6, 2024 · 194e42d · 194e42d
1 parent 7a57146
commit 194e42d
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 42 deletions.
diff --git a/packages/form-builder/tests/helpers/promise.js b/packages/form-builder/tests/helpers/promise.js
@@ -1,5 +1,4 @@
 import { later } from "@ember/runloop";
-import { Promise } from "rsvp";
 
 export function resolveAfter(ms) {
   return new Promise((resolve, reject) => {

diff --git a/packages/form-builder/tests/unit/utils/and-test.js b/packages/form-builder/tests/unit/utils/and-test.js
@@ -2,7 +2,6 @@
  * Copied and updated from nucleartide/ember-changeset-hofs
  */
 import { module, test } from "qunit";
-import { resolve } from "rsvp";
 
 import and from "@projectcaluma/ember-form-builder/utils/and";
 import { resolveAfter, rejectAfter } from "dummy/tests/helpers/promise";
@@ -154,21 +153,21 @@ module("Unit | Utility | and", function () {
 
       {
         const validators1 = [
-          () => resolve("first error"),
-          () => resolve("second error"),
-          () => resolve("third error"),
+          () => Promise.resolve("first error"),
+          () => Promise.resolve("second error"),
+          () => Promise.resolve("third error"),
         ];
 
         const validators2 = [
-          () => resolve("fourth error"),
-          () => resolve("fifth error"),
-          () => resolve("sixth error"),
+          () => Promise.resolve("fourth error"),
+          () => Promise.resolve("fifth error"),
+          () => Promise.resolve("sixth error"),
         ];
 
         const validators3 = [
-          () => resolve("seventh error"),
-          () => resolve("eighth error"),
-          () => resolve("ninth error"),
+          () => Promise.resolve("seventh error"),
+          () => Promise.resolve("eighth error"),
+          () => Promise.resolve("ninth error"),
         ];
 
         const validationFn = and(
@@ -181,21 +180,21 @@ module("Unit | Utility | and", function () {
 
       {
         const validators1 = [
-          () => resolve(true),
-          () => resolve(true),
-          () => resolve(true),
+          () => Promise.resolve(true),
+          () => Promise.resolve(true),
+          () => Promise.resolve(true),
         ];
 
         const validators2 = [
-          () => resolve(true),
-          () => resolve("leeroy jenkins"),
-          () => resolve(true),
+          () => Promise.resolve(true),
+          () => Promise.resolve("leeroy jenkins"),
+          () => Promise.resolve(true),
         ];
 
         const validators3 = [
-          () => resolve(true),
-          () => resolve(true),
-          () => resolve(true),
+          () => Promise.resolve(true),
+          () => Promise.resolve(true),
+          () => Promise.resolve(true),
         ];
 
         const validationFn = and(

diff --git a/packages/form-builder/tests/unit/utils/or-test.js b/packages/form-builder/tests/unit/utils/or-test.js
@@ -2,7 +2,6 @@
  * Copied and updated from nucleartide/ember-changeset-hofs
  */
 import { module, test } from "qunit";
-import { resolve } from "rsvp";
 
 import or from "@projectcaluma/ember-form-builder/utils/or";
 import { resolveAfter, rejectAfter } from "dummy/tests/helpers/promise";
@@ -173,9 +172,9 @@ module("Unit | Utility | or", function () {
 
     test("should return the last error if all validators return errors", async function (assert) {
       const validators = [
-        () => resolve("first error"),
-        () => resolve("second error"),
-        () => resolve("third error"),
+        () => Promise.resolve("first error"),
+        () => Promise.resolve("second error"),
+        () => Promise.resolve("third error"),
       ];
 
       const validationFn = or(...validators);
@@ -187,21 +186,21 @@ module("Unit | Utility | or", function () {
 
       {
         const validators1 = [
-          () => resolve("first error"),
-          () => resolve("second error"),
-          () => resolve("third error"),
+          () => Promise.resolve("first error"),
+          () => Promise.resolve("second error"),
+          () => Promise.resolve("third error"),
         ];
 
         const validators2 = [
-          () => resolve("fourth error"),
-          () => resolve("fifth error"),
-          () => resolve("sixth error"),
+          () => Promise.resolve("fourth error"),
+          () => Promise.resolve("fifth error"),
+          () => Promise.resolve("sixth error"),
         ];
 
         const validators3 = [
-          () => resolve("seventh error"),
-          () => resolve("eighth error"),
-          () => resolve("ninth error"),
+          () => Promise.resolve("seventh error"),
+          () => Promise.resolve("eighth error"),
+          () => Promise.resolve("ninth error"),
         ];
 
         const validationFn = or(
@@ -214,21 +213,21 @@ module("Unit | Utility | or", function () {
 
       {
         const validators1 = [
-          () => resolve("first error"),
-          () => resolve("second error"),
-          () => resolve("third error"),
+          () => Promise.resolve("first error"),
+          () => Promise.resolve("second error"),
+          () => Promise.resolve("third error"),
         ];
 
         const validators2 = [
-          () => resolve("fourth error"),
-          () => resolve(true), // derp
-          () => resolve("sixth error"),
+          () => Promise.resolve("fourth error"),
+          () => Promise.resolve(true), // derp
+          () => Promise.resolve("sixth error"),
         ];
 
         const validators3 = [
-          () => resolve("seventh error"),
-          () => resolve("eighth error"),
-          () => resolve("ninth error"),
+          () => Promise.resolve("seventh error"),
+          () => Promise.resolve("eighth error"),
+          () => Promise.resolve("ninth error"),
         ];
 
         const validationFn = or(