@projectcaluma/ember-testing 11.0.0-beta.9 → 11.0.0

package/addon/scenarios/distribution.js

@@ -73,9 +73,14 @@ export function createBlueprint(server) {
   server.create("workflow", { slug: "distribution" });
   server.create("workflow", { slug: "inquiry" });
 
+  server.create("task", { slug: "distribution" });
   server.create("task", { slug: "create-inquiry" });
   server.create("task", { slug: "complete-distribution" });
-  server.create("task", { slug: "inquiry" });
+  server.create("task", {
+    slug: "inquiry",
+    formId: inquiryForm.id,
+    type: "COMPLETE_TASK_FORM",
+  });
   server.create("task", {
     slug: "compose-inquiry-answer",
     type: "COMPLETE_WORKFLOW_FORM",
@@ -86,6 +91,7 @@ export function createBlueprint(server) {
     slug: "adjust-inquiry-answer",
     type: "COMPLETE_WORKFLOW_FORM",
   });
+  server.create("task", { slug: "check-inquiries" });
 }
 
 export function createInquiry(
@@ -94,10 +100,7 @@ export function createInquiry(
   { from, to, remark, deadline },
   workItemAttrs = {}
 ) {
-  const document = server.create("document", {
-    formId: "inquiry",
-    modifiedContentByUser: "1",
-  });
+  const document = server.create("document", { formId: "inquiry" });
 
   server.create("answer", {
     document,
@@ -134,7 +137,7 @@ export function sendInquiry(server, { inquiry }) {
     workflowId: "inquiry",
     document: server.create("document", {
       formId: "inquiry-answer",
-      modifiedContentByUser: "1",
+      modifiedContentAt: faker.date.recent(),
     }),
   });
 
@@ -191,8 +194,8 @@ export function answerInquiry(server, { inquiry, status, reason, hint }) {
   return inquiry;
 }
 
-export function confirmInquiry({ inquiry }) {
-  inquiry.update({ status: "COMPLETED" });
+export function confirmInquiry(server, { inquiry }) {
+  inquiry.update({ status: "COMPLETED", isRedoable: true });
   inquiry.childCase.update({
     status: "COMPLETED",
     closedAt: faker.date.recent(),
@@ -204,6 +207,21 @@ export function confirmInquiry({ inquiry }) {
     .filter((workItem) => workItem.taskId === "revise-inquiry-answer")
     .update({ status: "CANCELED" });
 
+  if (
+    !inquiry.case.workItems.filter(
+      (workItem) =>
+        workItem.taskId === "check-inquiries" &&
+        String(workItem.addressedGroups) === String(inquiry.addressedGroups)
+    ).length
+  ) {
+    server.create("work-item", {
+      taskId: "check-inquiries",
+      status: "READY",
+      case: inquiry.case,
+      addressedGroups: inquiry.addressedGroups,
+    });
+  }
+
   return inquiry;
 }
 
@@ -225,10 +243,17 @@ export function reviseInquiry(server, { inquiry }) {
 }
 
 export function createCase(server, { group }) {
+  const distributionWorkItem = server.create("work-item", {
+    taskId: "distribution",
+    status: "READY",
+    case: server.create("case"),
+  });
+
   const distributionCase = server.create("case", {
     id: "4222ab21-9c89-47de-98be-d62a8ed0ebeb",
     status: "RUNNING",
     workflowId: "distribution",
+    parentWorkItem: distributionWorkItem,
   });
 
   server.create("work-item", {
@@ -261,7 +286,7 @@ export default function (server, groups) {
   const withdraw = (...args) => withdrawInquiry(server, ...args);
   const send = (...args) => sendInquiry(server, ...args);
   const answer = (...args) => answerInquiry(server, ...args);
-  const confirm = (...args) => confirmInquiry(...args);
+  const confirm = (...args) => confirmInquiry(server, ...args);
   const revise = (...args) => reviseInquiry(server, ...args);
 
   const distributionCase = createCase(server, { group: g });
@@ -281,7 +306,7 @@ export default function (server, groups) {
         to: g2,
         deadline: faker.date.past(),
       },
-      { id: "6bbdc36a-3174-4578-93d4-0cb84d3dab97" }
+      { id: "6bbdc36a-3174-4578-93d4-0cb84d3dab97", meta: {} }
     ),
   });
   confirm({
@@ -389,4 +414,6 @@ export default function (server, groups) {
       status: "inquiry-answer-status-positive",
     }),
   });
+
+  return distributionCase;
 }

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

@@ -58,15 +58,19 @@ export default Factory.extend({
             .slug,
         });
       }
-    } else if (answer.question.type === "FILE") {
-      answer.update({ type: "FILE" });
+    } else if (answer.question.type === "FILES") {
+      answer.update({ type: "FILES" });
 
       if (answer.value === undefined) {
         answer.update({
-          value: {
-            uploadUrl: faker.internet.url,
-            downloadUrl: faker.internet.url,
-          },
+          value: [
+            {
+              id: faker.datatype.uuid(),
+              name: faker.datatype.string(),
+              uploadUrl: faker.internet.url(),
+              downloadUrl: faker.internet.url(),
+            },
+          ],
         });
       }
     } else if (answer.question.type === "DATE") {

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

@@ -3,6 +3,4 @@ import { Factory } from "miragejs";
 
 export default Factory.extend({
   id: () => faker.datatype.uuid(),
-  modifiedContentByUser: () => faker.datatype.uuid(),
-  modifiedContentAt: () => faker.date.past(),
 });

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

@@ -3,7 +3,7 @@ import { Factory } from "miragejs";
 
 export default Factory.extend({
   id: () => faker.datatype.uuid(),
-  createdAt: () => faker.date.past(),
+  name: () => faker.datatype.string(),
   modifiedAt: () => faker.date.past(),
   createdByUser: () => faker.datatype.uuid(),
   uploadUrl: () => faker.internet.url(),

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

@@ -11,4 +11,8 @@ export default Factory.extend({
   isArchived: false,
   isPublished: true,
   meta: () => ({}),
+  createdByUser: () => faker.random.numeric(10),
+  createdByGroup: () => faker.random.numeric(10),
+  modifiedByUser: () => faker.random.numeric(10),
+  modifiedByGroup: () => faker.random.numeric(10),
 });

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

@@ -11,9 +11,11 @@ export default Factory.extend({
   deadline: () => faker.date.future(),
   status: () => faker.helpers.arrayElement(STATUS),
   addressedGroups: () => ["group1", "group2"],
+  assignedUsers: () => ["1"],
   closedAt() {
     return STATUS.filter((s) => s !== "READY").includes(this.status)
       ? faker.date.past()
       : null;
   },
+  isRedoable: () => false,
 });

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

@@ -1,6 +1,7 @@
 import { Model, belongsTo, hasMany } from "miragejs";
 
 export default Model.extend({
+  form: belongsTo(),
   workflow: belongsTo(),
   workItems: hasMany(),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-testing",
-  "version": "11.0.0-beta.9",
+  "version": "11.0.0",
   "description": "Ember addon for testing with Caluma addons.",
   "keywords": [
     "ember-addon"
@@ -9,56 +9,57 @@
   "homepage": "https://docs.caluma.io/ember-caluma",
   "repository": "github:projectcaluma/ember-caluma",
   "scripts": {
-    "test": "npm-run-all test:*",
+    "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
     "test:ember": "ember test",
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@ember/string": "^3.0.0",
-    "@faker-js/faker": "^7.2.0",
+    "@ember/string": "^3.0.1",
+    "@faker-js/faker": "^7.6.0",
     "broccoli-funnel": "^3.0.8",
     "broccoli-merge-trees": "^4.2.0",
-    "ember-apollo-client": "^4.0.2",
-    "ember-auto-import": "^2.4.2",
+    "ember-apollo-client": "~4.0.2",
+    "ember-auto-import": "^2.6.0",
     "ember-cli-babel": "^7.26.11",
-    "ember-cli-htmlbars": "^6.0.1",
+    "ember-cli-htmlbars": "^6.2.0",
     "ember-cli-mirage": "^3.0.0-alpha.3",
-    "ember-fetch": "^8.1.1",
+    "ember-fetch": "^8.1.2",
     "ember-inflector": "^4.0.2",
     "graphql": "^15.8.0",
     "graphql-iso-date": "^3.6.1",
     "graphql-tools": "^4.0.8",
-    "luxon": "^2.4.0",
-    "miragejs": "^0.1.45"
+    "luxon": "^3.2.1",
+    "miragejs": "^0.1.47"
   },
   "devDependencies": {
     "@ember/optional-features": "2.0.0",
-    "@ember/test-helpers": "2.8.1",
-    "@embroider/test-setup": "1.7.1",
+    "@ember/test-helpers": "2.7.0",
+    "@embroider/test-setup": "2.1.1",
     "broccoli-asset-rev": "3.0.0",
-    "ember-cli": "3.28.5",
-    "ember-cli-code-coverage": "1.0.3",
+    "concurrently": "7.6.0",
+    "ember-cli": "4.9.2",
+    "ember-cli-code-coverage": "2.0.0",
     "ember-cli-dependency-checker": "3.3.1",
     "ember-cli-inject-live-reload": "2.1.0",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
-    "ember-disable-prototype-extensions": "1.1.3",
-    "ember-export-application-global": "2.0.1",
     "ember-load-initializers": "2.1.2",
-    "ember-maybe-import-regenerator": "1.0.0",
-    "ember-qunit": "5.1.5",
-    "ember-resolver": "8.0.3",
-    "ember-source": "3.28.9",
+    "ember-qunit": "6.1.1",
+    "ember-resolver": "8.1.0",
+    "ember-source": "4.10.0",
     "ember-source-channel-url": "3.0.0",
     "ember-try": "2.0.0",
     "graphql-tag": "2.12.6",
     "loader.js": "4.7.0",
-    "qunit": "2.19.1",
+    "qunit": "2.19.4",
     "qunit-dom": "2.0.0",
-    "webpack": "5.73.0"
+    "webpack": "5.75.0"
+  },
+  "peerDependencies": {
+    "ember-source": "^3.28.0 || ^4.0.0"
   },
   "engines": {
-    "node": "12.* || 14.* || >= 16"
+    "node": "14.* || 16.* || >= 18"
   },
   "ember": {
     "edition": "octane"

package/config/environment.js

@@ -1,5 +0,0 @@
-"use strict";
-
-module.exports = function (/* environment, appConfig */) {
-  return {};
-};