@projectcaluma/ember-testing 10.1.0 → 11.0.0-beta.2

package/addon/mirage-graphql/schema.graphql

@@ -361,11 +361,6 @@ type Case implements Node {
   """
   id: ID!
 
-  """
-  Stores a path to the given object
-  """
-  path: [String]!
-
   """
   Time when case has either been canceled or completed
   """
@@ -1163,11 +1158,6 @@ type Document implements Node {
   The ID of the object.
   """
   id: ID!
-
-  """
-  Stores a path to the given object
-  """
-  path: [String]!
   form: Form!
 
   """
@@ -4078,7 +4068,6 @@ enum SortableDocumentAttributes {
   CREATED_BY_GROUP
   MODIFIED_BY_USER
   MODIFIED_BY_GROUP
-  PATH
   FORM
   SOURCE
 }
@@ -4991,11 +4980,6 @@ type WorkItem implements Node {
   """
   id: ID!
 
-  """
-  Stores a path to the given object
-  """
-  path: [String]!
-
   """
   Will be set from Task, if not provided.
   """

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" });
@@ -8,12 +8,16 @@ export function createBlueprint(server) {
   server.create("question", {
     slug: "inquiry-remark",
     label: "Remark",
+    isRequired: "true",
+    maxLength: 9999,
+    minLength: 0,
     formIds: [inquiryForm.id],
     type: "TEXTAREA",
   });
   server.create("question", {
     slug: "inquiry-deadline",
     label: "Deadline",
+    isRequired: "true",
     formIds: [inquiryForm.id],
     type: "DATE",
   });
@@ -22,6 +26,8 @@ export function createBlueprint(server) {
     slug: "inquiry-answer-status",
     type: "CHOICE",
     formIds: [inquiryAnswerForm.id],
+    isRequired: "true",
+    label: "Status",
     options: [
       server.create("option", {
         slug: "inquiry-answer-status-positive",
@@ -39,12 +45,30 @@ export function createBlueprint(server) {
   });
   server.create("question", {
     slug: "inquiry-answer-reason",
+    isRequired: "true",
+    maxLength: 9999,
+    minLength: 0,
     label: "Reason",
     type: "TEXTAREA",
     formIds: [inquiryAnswerForm.id],
   });
 
+  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",
+    type: "COMPLETE_WORKFLOW_FORM",
+  });
+  server.create("task", { slug: "confirm-inquiry-answer" });
+  server.create("task", { slug: "revise-inquiry-answer" });
+  server.create("task", {
+    slug: "adjust-inquiry-answer",
+    type: "COMPLETE_WORKFLOW_FORM",
+  });
 }
 
 export function createInquiry(
@@ -53,27 +77,22 @@ export function createInquiry(
   { from, to, remark, deadline },
   workItemAttrs = {}
 ) {
-  const form = server.schema.forms.findBy({ slug: "inquiry" });
-  const document = server.create("document", { form });
+  const document = server.create("document", { formId: "inquiry" });
 
   server.create("answer", {
     document,
-    question: server.schema.questions.findBy({
-      slug: "inquiry-remark",
-    }),
+    questionId: "inquiry-remark",
     value: remark ?? faker.lorem.paragraph(),
   });
 
   server.create("answer", {
     document,
-    question: server.schema.questions.findBy({
-      slug: "inquiry-deadline",
-    }),
+    questionId: "inquiry-deadline",
     value: deadline ?? faker.date.future(),
   });
 
   return server.create("work-item", {
-    task: server.schema.tasks.findBy({ slug: "inquiry" }),
+    taskId: "inquiry",
     document,
     status: "SUSPENDED",
     case: distributionCase,
@@ -84,16 +103,21 @@ export function createInquiry(
 }
 
 export function sendInquiry(server, { inquiry }) {
-  inquiry.update({
+  const childCase = server.create("case", {
+    status: "RUNNING",
+    workflowId: "inquiry",
+    document: server.create("document", { formId: "inquiry-answer" }),
+  });
+
+  server.create("work-item", {
+    taskId: "compose-inquiry-answer",
     status: "READY",
-    childCase: server.create("case", {
-      status: "RUNNING",
-      document: server.create("document", {
-        form: server.schema.forms.findBy({ slug: "inquiry-answer" }),
-      }),
-    }),
+    case: childCase,
+    addressedGroups: inquiry.addressedGroups,
   });
 
+  inquiry.update({ status: "READY", childCase });
+
   return inquiry;
 }
 
@@ -104,34 +128,94 @@ export function answerInquiry(server, { inquiry, status, reason }) {
 
   server.create("answer", {
     document: inquiry.childCase.document,
-    question: server.schema.questions.findBy({
-      slug: "inquiry-answer-status",
-    }),
+    questionId: "inquiry-answer-status",
     value: status,
   });
 
   server.create("answer", {
     document: inquiry.childCase.document,
-    question: server.schema.questions.findBy({
-      slug: "inquiry-answer-reason",
-    }),
+    questionId: "inquiry-answer-reason",
     value: reason ?? faker.lorem.paragraph(),
   });
 
+  inquiry.childCase.workItems
+    .filter((workItem) => workItem.taskId === "compose-inquiry-answer")
+    .update({ status: "COMPLETED" });
+  server.create("work-item", {
+    taskId: "confirm-inquiry-answer",
+    status: "READY",
+    case: inquiry.childCase,
+    addressedGroups: inquiry.addressedGroups,
+  });
+  server.create("work-item", {
+    taskId: "revise-inquiry-answer",
+    status: "READY",
+    case: inquiry.childCase,
+    addressedGroups: inquiry.addressedGroups,
+  });
+
+  return inquiry;
+}
+
+export function confirmInquiry({ inquiry }) {
   inquiry.update({ status: "COMPLETED" });
   inquiry.childCase.update({
     status: "COMPLETED",
     closedAt: faker.date.recent(),
   });
+  inquiry.childCase.workItems
+    .filter((workItem) => workItem.taskId === "confirm-inquiry-answer")
+    .update({ status: "COMPLETED" });
+  inquiry.childCase.workItems
+    .filter((workItem) => workItem.taskId === "revise-inquiry-answer")
+    .update({ status: "CANCELED" });
 
   return inquiry;
 }
 
-export default function (server, groups) {
+export function reviseInquiry(server, { inquiry }) {
+  server.create("work-item", {
+    taskId: "adjust-inquiry-answer",
+    status: "READY",
+    case: inquiry.childCase,
+    addressedGroups: inquiry.addressedGroups,
+  });
+  inquiry.childCase.workItems
+    .filter((workItem) => workItem.taskId === "confirm-inquiry-answer")
+    .update({ status: "CANCELED" });
+  inquiry.childCase.workItems
+    .filter((workItem) => workItem.taskId === "revise-inquiry-answer")
+    .update({ status: "COMPLETED" });
+
+  return inquiry;
+}
+
+export function createCase(server, { group }) {
   const distributionCase = server.create("case", {
-    workflow: server.create("workflow", { slug: "distribution" }),
+    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];
@@ -141,8 +225,16 @@ export default function (server, groups) {
   const create = (...args) => createInquiry(server, distributionCase, ...args);
   const send = (...args) => sendInquiry(server, ...args);
   const answer = (...args) => answerInquiry(server, ...args);
+  const confirm = (...args) => confirmInquiry(...args);
+  const revise = (...args) => reviseInquiry(server, ...args);
 
-  createBlueprint(server);
+  const distributionCase = createCase(server, { group: g1 });
+
+  server.create("work-item", {
+    taskId: "create-inquiry",
+    status: "READY",
+    addressedGroups: [g.id],
+  });
 
   // controlling
   create({ from: g, to: g1 });
@@ -153,24 +245,31 @@ export default function (server, groups) {
       deadline: faker.date.past(),
     }),
   });
-  answer({
-    inquiry: create({
-      from: g,
-      to: g3,
-      deadline: faker.date.past(),
+  confirm({
+    inquiry: answer({
+      inquiry: create({
+        from: g,
+        to: g3,
+        deadline: faker.date.past(),
+      }),
+      status: "inquiry-answer-status-needs-interaction",
     }),
-    status: "inquiry-answer-status-needs-interaction",
   });
+
   // "override" third controlling inquiry
-  answer({
-    inquiry: create({ from: g, to: g3 }, { createdAt: faker.date.recent() }),
-    status: "inquiry-answer-status-positive",
+  confirm({
+    inquiry: answer({
+      inquiry: create({ from: g, to: g3 }, { createdAt: faker.date.recent() }),
+      status: "inquiry-answer-status-positive",
+    }),
   });
 
   // addressed
-  answer({
-    inquiry: create({ from: g2, to: g }),
-    status: "inquiry-answer-status-needs-interaction",
+  confirm({
+    inquiry: answer({
+      inquiry: create({ from: g2, to: g }),
+      status: "inquiry-answer-status-needs-interaction",
+    }),
   });
   // "override" first addressed inquiry
   send({
@@ -178,23 +277,39 @@ 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() }
     ),
   });
+  confirm({
+    inquiry: answer({
+      inquiry: create({ from: g4, to: g }),
+      status: "inquiry-answer-status-negative",
+    }),
+  });
   answer({
-    inquiry: create({ from: g4, to: g }),
-    status: "inquiry-answer-status-negative",
+    inquiry: create({ from: g3, to: g }),
+    status: "inquiry-answer-status-positive",
+  });
+  revise({
+    inquiry: answer({
+      inquiry: create({ from: g1, to: g }),
+      status: "inquiry-answer-status-needs-interaction",
+    }),
   });
 
   // more
-  answer({
-    inquiry: create({ from: g2, to: g3 }),
-    status: "inquiry-answer-status-needs-interaction",
+  confirm({
+    inquiry: answer({
+      inquiry: create({ from: g2, to: g3 }),
+      status: "inquiry-answer-status-needs-interaction",
+    }),
   });
-  answer({
-    inquiry: create({ from: g3, to: g4 }),
-    status: "inquiry-answer-status-positive",
+  confirm({
+    inquiry: answer({
+      inquiry: create({ from: g3, to: g4 }),
+      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

@@ -0,0 +1,9 @@
+import { Factory } from "miragejs";
+
+export default Factory.extend({
+  id() {
+    return this.slug;
+  },
+  name: (i) => `Workflow #${i + 1}`,
+  slug: (i) => `workflow-${i + 1}`,
+});

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

@@ -1,6 +1,7 @@
-import { Model, belongsTo } from "ember-cli-mirage";
+import { Model, belongsTo, hasMany } from "miragejs";
 
 export default Model.extend({
-  document: belongsTo(),
+  document: belongsTo("document"),
   question: belongsTo(),
+  documents: hasMany("document", { inverse: null }),
 });

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

@@ -1,7 +1,8 @@
-import { Model, belongsTo, hasMany } from "ember-cli-mirage";
+import { Model, belongsTo, hasMany } from "miragejs";
 
 export default Model.extend({
   document: belongsTo(),
   workflow: belongsTo(),
+  parentWorkItem: belongsTo("workItem", { inverse: "childCase" }),
   workItems: hasMany(),
 });

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,5 +1,5 @@
-import { Model, hasMany } from "ember-cli-mirage";
+import { Model, hasMany } from "miragejs";
 
 export default Model.extend({
-  questions: hasMany(),
+  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,7 +1,10 @@
-import { Model, hasMany, belongsTo } from "ember-cli-mirage";
+import { Model, hasMany, belongsTo } from "miragejs";
 
 export default Model.extend({
-  forms: hasMany(),
+  forms: hasMany({ inverse: "questions" }),
   options: hasMany(),
+  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.1.0",
+  "version": "11.0.0-beta.2",
   "description": "Ember addon for testing with Caluma addons.",
   "keywords": [
     "ember-addon"
@@ -14,27 +14,28 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
+    "@faker-js/faker": "^6.0.0-alpha.5",
     "broccoli-funnel": "^3.0.8",
     "broccoli-merge-trees": "^4.2.0",
     "ember-apollo-client": "^3.2.0",
-    "ember-auto-import": "^2.2.3",
-    "ember-cli-babel": "^7.26.6",
+    "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.6.1",
+    "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.48.1",
+    "@embroider/test-setup": "1.0.0",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "3.28.4",
+    "ember-cli": "3.28.5",
     "ember-cli-code-coverage": "1.0.3",
     "ember-cli-dependency-checker": "3.2.0",
     "ember-cli-inject-live-reload": "2.1.0",
@@ -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.68.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"