@projectcaluma/ember-testing 10.2.0-beta.1 → 11.0.0-beta.3

package/addon/mirage-graphql/mocks/answer.js

@@ -1,4 +1,4 @@
-import moment from "moment";
+import { DateTime } from "luxon";
 
 import { register } from "@projectcaluma/ember-testing/mirage-graphql";
 import BaseMock from "@projectcaluma/ember-testing/mirage-graphql/mocks/base";
@@ -74,13 +74,7 @@ export default class extends BaseMock {
   @register("SaveDefaultDateAnswerPayload")
   handleSaveDateAnswer(_, { input }) {
     const date = input.value;
-    const value = date
-      ? moment({
-          day: date.getUTCDate(),
-          month: date.getUTCMonth(),
-          year: date.getUTCFullYear(),
-        }).format(moment.HTML5_FMT.DATE)
-      : null;
+    const value = date ? DateTime.fromJSDate(date).toISODate() : null;
 
     return this._handleSaveDocumentAnswer(_, {
       ...input,

package/addon/mirage-graphql/mocks/base.js

@@ -1,6 +1,6 @@
 import { camelize, dasherize, classify } from "@ember/string";
+import { faker } from "@faker-js/faker";
 import { singularize, pluralize } from "ember-inflector";
-import faker from "faker";
 import { MockList } from "graphql-tools";
 
 import {

package/addon/mirage-graphql/mocks/work-item.js

@@ -1,8 +1,11 @@
+import { DateTime } from "luxon";
+
 import {
   register,
   deserialize,
 } from "@projectcaluma/ember-testing/mirage-graphql";
 import BaseMock from "@projectcaluma/ember-testing/mirage-graphql/mocks/base";
+import { createInquiry } from "@projectcaluma/ember-testing/scenarios/distribution";
 
 export default class extends BaseMock {
   @register("ResumeWorkItemPayload")
@@ -63,6 +66,36 @@ export default class extends BaseMock {
         status: "READY",
         taskId: "adjust-inquiry-answer",
       });
+    } else if (taskId === "create-inquiry") {
+      const { addressed_groups: groups } = JSON.parse(input.context);
+
+      groups.forEach((group) => {
+        createInquiry(
+          this.server,
+          workItem.case,
+          {
+            to: { id: group },
+            from: { id: workItem.addressedGroups[0] },
+            remark: "",
+            deadline: DateTime.now().plus({ days: 30 }).toJSDate(),
+          },
+          {
+            createdAt: new Date(),
+          }
+        );
+
+        this.server.create("work-item", {
+          taskId: "create-inquiry",
+          status: "READY",
+          addressedGroups: [group],
+        });
+      });
+
+      this.server.create("work-item", {
+        taskId: "create-inquiry",
+        status: "READY",
+        addressedGroups: workItem.addressedGroups,
+      });
     }
 
     return this.handleSavePayload.fn.call(this, _, {

package/addon/scenarios/distribution.js

@@ -1,5 +1,5 @@
-import faker from "faker";
-import moment from "moment";
+import { faker } from "@faker-js/faker";
+import { DateTime } from "luxon";
 
 export function createBlueprint(server) {
   const inquiryForm = server.create("form", { slug: "inquiry" });
@@ -56,6 +56,8 @@ export function createBlueprint(server) {
   server.create("workflow", { slug: "distribution" });
   server.create("workflow", { slug: "inquiry" });
 
+  server.create("task", { slug: "create-inquiry" });
+  server.create("task", { slug: "complete-distribution" });
   server.create("task", { slug: "inquiry" });
   server.create("task", {
     slug: "compose-inquiry-answer",
@@ -188,14 +190,33 @@ export function reviseInquiry(server, { inquiry }) {
   return inquiry;
 }
 
-export default function (server, groups) {
-  createBlueprint(server);
-
+export function createCase(server, { group }) {
   const distributionCase = server.create("case", {
+    id: "4222ab21-9c89-47de-98be-d62a8ed0ebeb",
     status: "RUNNING",
     workflowId: "distribution",
   });
 
+  server.create("work-item", {
+    case: distributionCase,
+    taskId: "create-inquiry",
+    status: "READY",
+    addressedGroups: [group.id],
+  });
+
+  server.create("work-item", {
+    case: distributionCase,
+    taskId: "complete-distribution",
+    status: "READY",
+    addressedGroups: [group.id],
+  });
+
+  return distributionCase;
+}
+
+export default function (server, groups) {
+  createBlueprint(server);
+
   const g = groups[0];
   const g1 = groups[1];
   const g2 = groups[2];
@@ -208,22 +229,30 @@ export default function (server, groups) {
   const confirm = (...args) => confirmInquiry(...args);
   const revise = (...args) => reviseInquiry(server, ...args);
 
+  const distributionCase = createCase(server, { group: g });
+
   // controlling
   create({ from: g, to: g1 });
   send({
-    inquiry: create({
-      from: g,
-      to: g2,
-      deadline: faker.date.past(),
-    }),
+    inquiry: create(
+      {
+        from: g,
+        to: g2,
+        deadline: faker.date.past(),
+      },
+      { id: "6bbdc36a-3174-4578-93d4-0cb84d3dab97" }
+    ),
   });
   confirm({
     inquiry: answer({
-      inquiry: create({
-        from: g,
-        to: g3,
-        deadline: faker.date.past(),
-      }),
+      inquiry: create(
+        {
+          from: g,
+          to: g3,
+          deadline: faker.date.past(),
+        },
+        { id: "88999388-daf2-4a18-b7e2-50373d082331" }
+      ),
       status: "inquiry-answer-status-needs-interaction",
     }),
   });
@@ -231,7 +260,13 @@ export default function (server, groups) {
   // "override" third controlling inquiry
   confirm({
     inquiry: answer({
-      inquiry: create({ from: g, to: g3 }, { createdAt: faker.date.recent() }),
+      inquiry: create(
+        { from: g, to: g3 },
+        {
+          id: "75d56729-5518-469d-ae66-188a5c32d59d",
+          createdAt: faker.date.recent(),
+        }
+      ),
       status: "inquiry-answer-status-positive",
     }),
   });
@@ -239,7 +274,10 @@ export default function (server, groups) {
   // addressed
   confirm({
     inquiry: answer({
-      inquiry: create({ from: g2, to: g }),
+      inquiry: create(
+        { from: g2, to: g },
+        { id: "e907584c-a38a-488e-80f7-bab6bb22f303" }
+      ),
       status: "inquiry-answer-status-needs-interaction",
     }),
   });
@@ -249,24 +287,36 @@ export default function (server, groups) {
       {
         from: g2,
         to: g,
-        deadline: moment.utc().add(2, "days").toDate(),
+        deadline: DateTime.now().plus({ days: 2 }).toJSDate(),
       },
-      { createdAt: faker.date.recent() }
+      {
+        id: "4889435d-f310-472f-808b-7b20936c40fc",
+        createdAt: faker.date.recent(),
+      }
     ),
   });
   confirm({
     inquiry: answer({
-      inquiry: create({ from: g4, to: g }),
+      inquiry: create(
+        { from: g4, to: g },
+        { id: "4c5dbcc3-f42a-4c25-8d06-f85bd17edbf2" }
+      ),
       status: "inquiry-answer-status-negative",
     }),
   });
   answer({
-    inquiry: create({ from: g3, to: g }),
+    inquiry: create(
+      { from: g3, to: g },
+      { id: "3f7eea45-251d-4934-81fd-27c78bbca88c" }
+    ),
     status: "inquiry-answer-status-positive",
   });
   revise({
     inquiry: answer({
-      inquiry: create({ from: g1, to: g }),
+      inquiry: create(
+        { from: g1, to: g },
+        { id: "dd07b1a4-91e6-4411-a4ea-445637690577" }
+      ),
       status: "inquiry-answer-status-needs-interaction",
     }),
   });
@@ -274,13 +324,19 @@ export default function (server, groups) {
   // more
   confirm({
     inquiry: answer({
-      inquiry: create({ from: g2, to: g3 }),
+      inquiry: create(
+        { from: g2, to: g3 },
+        { id: "4f374860-28b3-465b-be5f-5e501a39fe8b" }
+      ),
       status: "inquiry-answer-status-needs-interaction",
     }),
   });
   confirm({
     inquiry: answer({
-      inquiry: create({ from: g3, to: g4 }),
+      inquiry: create(
+        { from: g3, to: g4 },
+        { id: "16eebfae-55c5-4d31-ad48-7ed5578a22a2" }
+      ),
       status: "inquiry-answer-status-positive",
     }),
   });

package/addon-mirage-support/factories/answer.js

@@ -1,6 +1,6 @@
-import { Factory } from "ember-cli-mirage";
-import faker from "faker";
-import moment from "moment";
+import { faker } from "@faker-js/faker";
+import { DateTime } from "luxon";
+import { Factory } from "miragejs";
 
 export default Factory.extend({
   id: () => faker.datatype.uuid(),
@@ -73,13 +73,7 @@ export default Factory.extend({
 
       if (answer.value === undefined) {
         const date = faker.date.future();
-        answer.update({
-          value: moment({
-            day: date.getUTCDate(),
-            month: date.getUTCMonth(),
-            year: date.getUTCFullYear(),
-          }).format(moment.HTML5_FMT.DATE),
-        });
+        answer.update({ value: DateTime.fromJSDate(date).toISODate() });
       }
     } else if (answer.question.type === "TABLE") {
       answer.update({ type: "TABLE" });

package/addon-mirage-support/factories/case.js

@@ -1,5 +1,5 @@
-import { Factory } from "ember-cli-mirage";
-import faker from "faker";
+import { faker } from "@faker-js/faker";
+import { Factory } from "miragejs";
 
 const STATUS = ["RUNNING", "COMPLETED", "CANCELED", "SUSPENDED"];
 

package/addon-mirage-support/factories/document.js

@@ -1,5 +1,5 @@
-import { Factory } from "ember-cli-mirage";
-import faker from "faker";
+import { faker } from "@faker-js/faker";
+import { Factory } from "miragejs";
 
 export default Factory.extend({
   id: () => faker.datatype.uuid(),

package/addon-mirage-support/factories/file.js

@@ -1,5 +1,5 @@
-import { Factory } from "ember-cli-mirage";
-import faker from "faker";
+import { faker } from "@faker-js/faker";
+import { Factory } from "miragejs";
 
 export default Factory.extend({
   id: () => faker.datatype.uuid(),

package/addon-mirage-support/factories/form.js

@@ -1,5 +1,5 @@
-import { Factory } from "ember-cli-mirage";
-import faker from "faker";
+import { faker } from "@faker-js/faker";
+import { Factory } from "miragejs";
 
 export default Factory.extend({
   id() {

package/addon-mirage-support/factories/format-validator.js

@@ -1,5 +1,5 @@
-import { Factory } from "ember-cli-mirage";
-import faker from "faker";
+import { faker } from "@faker-js/faker";
+import { Factory } from "miragejs";
 
 export default Factory.extend({
   id() {

package/addon-mirage-support/factories/option.js

@@ -1,4 +1,4 @@
-import { Factory } from "ember-cli-mirage";
+import { Factory } from "miragejs";
 
 export default Factory.extend({
   id() {

package/addon-mirage-support/factories/question.js

@@ -1,5 +1,5 @@
-import { Factory } from "ember-cli-mirage";
-import faker from "faker";
+import { faker } from "@faker-js/faker";
+import { Factory } from "miragejs";
 
 export default Factory.extend({
   id() {

package/addon-mirage-support/factories/task.js

@@ -1,5 +1,5 @@
-import { Factory } from "ember-cli-mirage";
-import faker from "faker";
+import { faker } from "@faker-js/faker";
+import { Factory } from "miragejs";
 
 export default Factory.extend({
   id() {

package/addon-mirage-support/factories/work-item.js

@@ -1,5 +1,5 @@
-import { Factory } from "ember-cli-mirage";
-import faker from "faker";
+import { faker } from "@faker-js/faker";
+import { Factory } from "miragejs";
 
 const STATUS = ["READY", "CANCELED", "COMPLETED", "SKIPPED", "SUSPENDED"];
 

package/addon-mirage-support/factories/workflow.js

@@ -1,4 +1,4 @@
-import { Factory } from "ember-cli-mirage";
+import { Factory } from "miragejs";
 
 export default Factory.extend({
   id() {

package/addon-mirage-support/models/answer.js

@@ -1,4 +1,4 @@
-import { Model, belongsTo, hasMany } from "ember-cli-mirage";
+import { Model, belongsTo, hasMany } from "miragejs";
 
 export default Model.extend({
   document: belongsTo("document"),

package/addon-mirage-support/models/case.js

@@ -1,4 +1,4 @@
-import { Model, belongsTo, hasMany } from "ember-cli-mirage";
+import { Model, belongsTo, hasMany } from "miragejs";
 
 export default Model.extend({
   document: belongsTo(),

package/addon-mirage-support/models/document.js

@@ -1,4 +1,4 @@
-import { Model, belongsTo, hasMany } from "ember-cli-mirage";
+import { Model, belongsTo, hasMany } from "miragejs";
 
 export default Model.extend({
   form: belongsTo(),

package/addon-mirage-support/models/file.js

@@ -1,3 +1,3 @@
-import { Model } from "ember-cli-mirage";
+import { Model } from "miragejs";
 
 export default Model.extend({});

package/addon-mirage-support/models/form.js

@@ -1,4 +1,4 @@
-import { Model, hasMany } from "ember-cli-mirage";
+import { Model, hasMany } from "miragejs";
 
 export default Model.extend({
   questions: hasMany({ inverse: "forms" }),

package/addon-mirage-support/models/format-validator.js

@@ -1,3 +1,3 @@
-import { Model } from "ember-cli-mirage";
+import { Model } from "miragejs";
 
 export default Model.extend({});

package/addon-mirage-support/models/option.js

@@ -1,4 +1,4 @@
-import { Model, hasMany } from "ember-cli-mirage";
+import { Model, hasMany } from "miragejs";
 
 export default Model.extend({
   questions: hasMany(),

package/addon-mirage-support/models/question.js

@@ -1,4 +1,4 @@
-import { Model, hasMany, belongsTo } from "ember-cli-mirage";
+import { Model, hasMany, belongsTo } from "miragejs";
 
 export default Model.extend({
   forms: hasMany({ inverse: "questions" }),
@@ -6,4 +6,5 @@ export default Model.extend({
   subForm: belongsTo("form", { inverse: null }),
   rowForm: belongsTo("form", { inverse: null }),
   defaultAnswer: belongsTo("answer", { inverse: null }),
+  formatValidators: hasMany(),
 });

package/addon-mirage-support/models/task.js

@@ -1,4 +1,4 @@
-import { Model, belongsTo, hasMany } from "ember-cli-mirage";
+import { Model, belongsTo, hasMany } from "miragejs";
 
 export default Model.extend({
   workflow: belongsTo(),

package/addon-mirage-support/models/work-item.js

@@ -1,4 +1,4 @@
-import { Model, belongsTo } from "ember-cli-mirage";
+import { Model, belongsTo } from "miragejs";
 
 export default Model.extend({
   case: belongsTo(),

package/addon-mirage-support/models/workflow.js

@@ -1,4 +1,4 @@
-import { Model, belongsTo, hasMany } from "ember-cli-mirage";
+import { Model, belongsTo, hasMany } from "miragejs";
 
 export default Model.extend({
   workflow: belongsTo(),

package/blueprints/@projectcaluma/ember-testing/index.js

@@ -5,10 +5,7 @@ module.exports = {
 
   afterInstall() {
     return this.addAddonsToProject({
-      packages: [
-        { name: "@projectcaluma/ember-core" },
-        { name: "ember-cli-mirage" },
-      ],
+      packages: [{ name: "ember-cli-mirage" }],
     }).then(() => this.addPackagesToProject([{ name: "faker" }]));
   },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-testing",
-  "version": "10.2.0-beta.1",
+  "version": "11.0.0-beta.3",
   "description": "Ember addon for testing with Caluma addons.",
   "keywords": [
     "ember-addon"
@@ -14,25 +14,26 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
+    "@faker-js/faker": "^6.0.0-alpha.6",
     "broccoli-funnel": "^3.0.8",
     "broccoli-merge-trees": "^4.2.0",
     "ember-apollo-client": "^3.2.0",
-    "ember-auto-import": "^2.2.3",
+    "ember-auto-import": "^2.4.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.0.1",
-    "ember-cli-mirage": "^2.2.0",
-    "ember-fetch": "^8.0.4",
+    "ember-cli-mirage": "^2.4.0",
+    "ember-fetch": "^8.1.1",
     "ember-inflector": "^4.0.2",
-    "faker": "^5.5.3",
     "graphql": "^15.8.0",
     "graphql-iso-date": "^3.6.1",
     "graphql-tools": "^4.0.8",
-    "moment": "^2.29.1"
+    "luxon": "^2.3.0",
+    "miragejs": "^0.1.43"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
     "@ember/test-helpers": "2.6.0",
-    "@embroider/test-setup": "0.49.0",
+    "@embroider/test-setup": "1.2.0",
     "broccoli-asset-rev": "3.0.0",
     "ember-cli": "3.28.5",
     "ember-cli-code-coverage": "1.0.3",
@@ -49,12 +50,11 @@
     "ember-source": "3.28.8",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
-    "get-graphql-schema": "2.1.2",
     "graphql-tag": "2.12.6",
     "loader.js": "4.7.0",
     "qunit": "2.17.2",
     "qunit-dom": "2.0.0",
-    "webpack": "5.65.0"
+    "webpack": "5.69.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"