@projectcaluma/ember-testing 11.0.0-beta.4 → 11.0.0-beta.5

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@projectcaluma/ember-testing-v11.0.0-beta.5](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-testing-v11.0.0-beta.4...@projectcaluma/ember-testing-v11.0.0-beta.5) (2022-03-23)
+
+
+### Bug Fixes
+
+* **embroider:** add missing dependency on @ember/string ([3a6e6bb](https://github.com/projectcaluma/ember-caluma/commit/3a6e6bb39a8c1a40a2ae00b3d4ea00606a755e25))
+* **embroider:** use factory function instead of dynamic importing ([91459e7](https://github.com/projectcaluma/ember-caluma/commit/91459e7add66139a1f268b6c74dbabd9fa486158))
+
+
+### Features
+
+* **testing:** add handler for canceling work items ([51c8024](https://github.com/projectcaluma/ember-caluma/commit/51c80240234fffa36a44a68a695ee7dbf074f1a9))
+* **testing:** extend distribution scenario with withdrawn inquiries ([a190f0f](https://github.com/projectcaluma/ember-caluma/commit/a190f0f7ccceeca2944b1647320c738d81d44733))
+
 # [@projectcaluma/ember-testing-v11.0.0-beta.4](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-testing-v11.0.0-beta.3...@projectcaluma/ember-testing-v11.0.0-beta.4) (2022-03-11)
 
 

package/addon/mirage-graphql/deserialize.js

@@ -0,0 +1,13 @@
+export default function deserialize(serialized) {
+  let decodedId = serialized.id;
+
+  try {
+    decodedId = atob(serialized.id).split(":")[1] || serialized.id;
+  } catch (e) {
+    // This will happen if the ID is not a relay ID (Type plus ID base64
+    // encoded) but just the raw ID. The deserialize function needs to be able
+    // to handle both
+  }
+
+  return { ...serialized, ...(decodedId ? { id: decodedId } : {}) };
+}

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

@@ -1,6 +1,6 @@
 import BaseFilter from "@projectcaluma/ember-testing/mirage-graphql/filters/base";
 
-export default class extends BaseFilter {
+export default class AnswerFilter extends BaseFilter {
   questions(records, value, { invert = false }) {
     return records.filter(
       (record) => invert !== value.includes(record.questionId)

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

@@ -1,6 +1,6 @@
 import { camelize } from "@ember/string";
 
-export default class {
+export default class BaseFilter {
   constructor(type) {
     this.type = type;
   }

package/addon/mirage-graphql/filters/form.js

@@ -1,6 +1,6 @@
 import BaseFilter from "@projectcaluma/ember-testing/mirage-graphql/filters/base";
 
-export default class extends BaseFilter {
+export default class FormFilter extends BaseFilter {
   isArchived(records, value) {
     return records.filter(({ isArchived }) => isArchived === value);
   }

package/addon/mirage-graphql/filters/index.js

@@ -0,0 +1,17 @@
+import AnswerFilter from "@projectcaluma/ember-testing/mirage-graphql/filters/answer";
+import BaseFilter from "@projectcaluma/ember-testing/mirage-graphql/filters/base";
+import FormFilter from "@projectcaluma/ember-testing/mirage-graphql/filters/form";
+import QuestionFilter from "@projectcaluma/ember-testing/mirage-graphql/filters/question";
+import WorkItemFilter from "@projectcaluma/ember-testing/mirage-graphql/filters/work-item";
+
+const FILTER_MAPPING = {
+  Answer: AnswerFilter,
+  Form: FormFilter,
+  Question: QuestionFilter,
+  WorkItem: WorkItemFilter,
+};
+
+export default function createFilter(type, ...args) {
+  const FilterClass = FILTER_MAPPING[type] ?? BaseFilter;
+  return new FilterClass(type, ...args);
+}

package/addon/mirage-graphql/filters/question.js

@@ -1,6 +1,6 @@
 import BaseFilter from "@projectcaluma/ember-testing/mirage-graphql/filters/base";
 
-export default class extends BaseFilter {
+export default class QuestionFilter extends BaseFilter {
   isArchived(records, value) {
     return records.filter(({ isArchived }) => isArchived === value);
   }

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

@@ -1,6 +1,6 @@
 import BaseFilter from "@projectcaluma/ember-testing/mirage-graphql/filters/base";
 
-export default class extends BaseFilter {
+export default class WorkItemFilter extends BaseFilter {
   status(records, value, { invert = false }) {
     return records.filter(({ status }) => invert !== (status === value));
   }

package/addon/mirage-graphql/index.js

@@ -1,64 +1,60 @@
-import { dasherize, classify } from "@ember/string";
-import require from "require";
-
-const importTypeOrBase = (path, type) => {
-  try {
-    return require(`${path}/${dasherize(type)}`).default;
-  } catch (e) {
-    return require(`${path}/base`).default;
-  }
-};
-
-export const register = (tpl) => (target, name, descriptor) => {
-  if (descriptor.value.__isHandler) {
-    descriptor.value.__handlerFor.push(tpl);
-    return descriptor;
-  }
-
-  descriptor.writable = false;
-  descriptor.enumerable = true;
-
-  descriptor.value = {
-    __isHandler: true,
-    // Mocks can have multiple handlers per type.
-    __handlerFor: [tpl],
-    fn: descriptor.value,
-  };
-
-  return descriptor;
-};
-
-export const serialize = (deserialized = {}, type) => {
-  const __typename = [deserialized.type?.toLowerCase(), type]
-    .filter(Boolean)
-    .map(classify)
-    .join("");
-
-  return {
-    ...deserialized,
-    id: btoa(`${__typename}:${deserialized.id}`),
-    __typename,
+import { classify } from "@ember/string";
+import { singularize } from "ember-inflector";
+import { graphql } from "graphql";
+import {
+  GraphQLDate as Date,
+  GraphQLDateTime as DateTime,
+} from "graphql-iso-date";
+import { addMockFunctionsToSchema, makeExecutableSchema } from "graphql-tools";
+
+import createMock from "@projectcaluma/ember-testing/mirage-graphql/mocks";
+import typeDefs from "@projectcaluma/ember-testing/mirage-graphql/schema.graphql";
+
+export default function createGraphqlHandler(server) {
+  return function graphqlHandler({ db }, request) {
+    const mocks = db._collections.reduce((m, { name }) => {
+      const cls = classify(singularize(name));
+      const mock = createMock(cls, server);
+
+      return { ...m, ...mock.getHandlers() };
+    }, {});
+
+    const schema = makeExecutableSchema({
+      typeDefs,
+      resolvers: {
+        Date,
+        DateTime,
+        GenericScalar: {
+          serialize(value) {
+            return typeof value === "string" ? JSON.parse(value) : value;
+          },
+        },
+      },
+      resolverValidationOptions: { requireResolversForResolveType: false },
+    });
+
+    const { query, variables } = JSON.parse(request.requestBody);
+
+    addMockFunctionsToSchema({
+      schema,
+      mocks: {
+        ...mocks,
+        JSONString: () => JSON.stringify({}),
+        GenericScalar: () => ({}),
+        Node: (_, { id }) => ({ __typename: atob(id).split(":")[0] }),
+        SelectedOption: ({ value }) => {
+          const option = server.schema.options.findBy({ slug: value });
+
+          return {
+            slug: value,
+            label: option.label,
+            __typename: "SelectedOption",
+          };
+        },
+      },
+      preserveResolvers: false,
+    });
+
+    return graphql(schema, query, null, null, variables);
   };
-};
-
-export const deserialize = (serialized) => {
-  let decodedId = serialized.id;
-
-  try {
-    decodedId = atob(serialized.id).split(":")[1] || serialized.id;
-  } catch (e) {
-    // this is expected most times
-  }
-
-  return { ...serialized, ...(decodedId ? { id: decodedId } : {}) };
-};
-
-export const Filter = function (type, ...args) {
-  return new (importTypeOrBase("./filters", type))(type, ...args);
-};
-
-export const Mock = function (type, ...args) {
-  return new (importTypeOrBase("./mocks", type))(type, ...args);
-};
-
-export { default } from "./handler";
+}

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

@@ -1,9 +1,9 @@
 import { DateTime } from "luxon";
 
-import { register } from "@projectcaluma/ember-testing/mirage-graphql";
 import BaseMock from "@projectcaluma/ember-testing/mirage-graphql/mocks/base";
+import register from "@projectcaluma/ember-testing/mirage-graphql/register";
 
-export default class extends BaseMock {
+export default class AnswerMock extends BaseMock {
   _handleSaveDocumentAnswer(
     _,
     { question: questionId, document: documentId, value, type }

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

@@ -3,12 +3,10 @@ import { faker } from "@faker-js/faker";
 import { singularize, pluralize } from "ember-inflector";
 import { MockList } from "graphql-tools";
 
-import {
-  Filter,
-  register,
-  serialize,
-  deserialize,
-} from "@projectcaluma/ember-testing/mirage-graphql";
+import deserialize from "@projectcaluma/ember-testing/mirage-graphql/deserialize";
+import createFilter from "@projectcaluma/ember-testing/mirage-graphql/filters";
+import register from "@projectcaluma/ember-testing/mirage-graphql/register";
+import serialize from "@projectcaluma/ember-testing/mirage-graphql/serialize";
 
 export const ANSWER_TYPES = [
   "DATE",
@@ -50,13 +48,13 @@ export const TYPE_MAPPING = {
   Task: TASK_TYPES,
 };
 
-export default class {
+export default class BaseMock {
   constructor(type, server) {
     this.type = type;
     this.server = server;
     this.schema = server.schema;
 
-    this.filter = new Filter(type);
+    this.filter = createFilter(type);
   }
 
   get collection() {

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

@@ -1,7 +1,7 @@
-import { register } from "@projectcaluma/ember-testing/mirage-graphql";
 import BaseMock from "@projectcaluma/ember-testing/mirage-graphql/mocks/base";
+import register from "@projectcaluma/ember-testing/mirage-graphql/register";
 
-export default class extends BaseMock {
+export default class FormMock extends BaseMock {
   @register("ReorderFormQuestionsPayload")
   handleReorderFormQuestions(_, { input }) {
     return this.handleSavePayload.fn.call(this, _, {

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

@@ -0,0 +1,17 @@
+import AnswerMock from "@projectcaluma/ember-testing/mirage-graphql/mocks/answer";
+import BaseMock from "@projectcaluma/ember-testing/mirage-graphql/mocks/base";
+import FormMock from "@projectcaluma/ember-testing/mirage-graphql/mocks/form";
+import QuestionMock from "@projectcaluma/ember-testing/mirage-graphql/mocks/question";
+import WorkItemMock from "@projectcaluma/ember-testing/mirage-graphql/mocks/work-item";
+
+const MOCK_MAPPING = {
+  Answer: AnswerMock,
+  Form: FormMock,
+  Question: QuestionMock,
+  WorkItem: WorkItemMock,
+};
+
+export default function createMock(type, ...args) {
+  const MockClass = MOCK_MAPPING[type] ?? BaseMock;
+  return new MockClass(type, ...args);
+}

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

@@ -1,7 +1,7 @@
-import { register } from "@projectcaluma/ember-testing/mirage-graphql";
 import BaseMock from "@projectcaluma/ember-testing/mirage-graphql/mocks/base";
+import register from "@projectcaluma/ember-testing/mirage-graphql/register";
 
-export default class extends BaseMock {
+export default class QuestionMock extends BaseMock {
   @register("SaveTextQuestionPayload")
   handleSaveTextQuestion(_, { input }) {
     return this.handleSavePayload.fn.call(this, _, {

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

@@ -1,13 +1,11 @@
 import { DateTime } from "luxon";
 
-import {
-  register,
-  deserialize,
-} from "@projectcaluma/ember-testing/mirage-graphql";
+import deserialize from "@projectcaluma/ember-testing/mirage-graphql/deserialize";
 import BaseMock from "@projectcaluma/ember-testing/mirage-graphql/mocks/base";
+import register from "@projectcaluma/ember-testing/mirage-graphql/register";
 import { createInquiry } from "@projectcaluma/ember-testing/scenarios/distribution";
 
-export default class extends BaseMock {
+export default class WorkItemMock extends BaseMock {
   @register("ResumeWorkItemPayload")
   handleResumeWorkItem(_, { input }) {
     return this.handleSavePayload.fn.call(this, _, {
@@ -22,6 +20,13 @@ export default class extends BaseMock {
     });
   }
 
+  @register("CancelWorkItemPayload")
+  handleCancelWorkItem(_, { input }) {
+    return this.handleSavePayload.fn.call(this, _, {
+      input: { id: input.id, status: "CANCELED" },
+    });
+  }
+
   @register("CompleteWorkItemPayload")
   handleCompleteWorkItem(_, { input }) {
     const { id } = deserialize(input);

package/addon/mirage-graphql/register.js

@@ -0,0 +1,20 @@
+export default function register(tpl) {
+  return function decorate(target, name, descriptor) {
+    if (descriptor.value.__isHandler) {
+      descriptor.value.__handlerFor.push(tpl);
+      return descriptor;
+    }
+
+    descriptor.writable = false;
+    descriptor.enumerable = true;
+
+    descriptor.value = {
+      __isHandler: true,
+      // Mocks can have multiple handlers per type.
+      __handlerFor: [tpl],
+      fn: descriptor.value,
+    };
+
+    return descriptor;
+  };
+}

package/addon/mirage-graphql/serialize.js

@@ -0,0 +1,14 @@
+import { classify } from "@ember/string";
+
+export default function serialize(deserialized = {}, type) {
+  const __typename = [deserialized.type?.toLowerCase(), type]
+    .filter(Boolean)
+    .map(classify)
+    .join("");
+
+  return {
+    ...deserialized,
+    id: btoa(`${__typename}:${deserialized.id}`),
+    __typename,
+  };
+}

package/addon/scenarios/distribution.js

@@ -110,6 +110,12 @@ export function createInquiry(
   });
 }
 
+export function withdrawInquiry(server, { inquiry }) {
+  inquiry.update({ status: "CANCELED" });
+
+  return inquiry;
+}
+
 export function sendInquiry(server, { inquiry }) {
   const childCase = server.create("case", {
     status: "RUNNING",
@@ -232,6 +238,7 @@ export default function (server, groups) {
   const g4 = groups[4];
 
   const create = (...args) => createInquiry(server, distributionCase, ...args);
+  const withdraw = (...args) => withdrawInquiry(server, ...args);
   const send = (...args) => sendInquiry(server, ...args);
   const answer = (...args) => answerInquiry(server, ...args);
   const confirm = (...args) => confirmInquiry(...args);
@@ -241,6 +248,12 @@ export default function (server, groups) {
 
   // controlling
   create({ from: g, to: g1 });
+  withdraw({
+    inquiry: create(
+      { from: g, to: g2 },
+      { id: "4afed640-07a6-4eb9-82a7-b5e961391370" }
+    ),
+  });
   send({
     inquiry: create(
       {
@@ -279,6 +292,14 @@ export default function (server, groups) {
     }),
   });
 
+  // withdrawn inquiry, should not be visible anywhere
+  withdraw({
+    inquiry: create(
+      { from: g, to: g4 },
+      { id: "7360fa66-83d2-4f6a-b489-5db46f6fd670" }
+    ),
+  });
+
   // addressed
   confirm({
     inquiry: answer({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectcaluma/ember-testing",
-  "version": "11.0.0-beta.4",
+  "version": "11.0.0-beta.5",
   "description": "Ember addon for testing with Caluma addons.",
   "keywords": [
     "ember-addon"
@@ -14,10 +14,11 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@faker-js/faker": "^6.0.0-beta.0",
+    "@ember/string": "^3.0.0",
+    "@faker-js/faker": "^6.0.0",
     "broccoli-funnel": "^3.0.8",
     "broccoli-merge-trees": "^4.2.0",
-    "ember-apollo-client": "^3.2.0",
+    "ember-apollo-client": "^4.0.2",
     "ember-auto-import": "^2.4.0",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-htmlbars": "^6.0.1",

package/addon/mirage-graphql/handler.js

@@ -1,60 +0,0 @@
-import { classify } from "@ember/string";
-import { singularize } from "ember-inflector";
-import { graphql } from "graphql";
-import {
-  GraphQLDate as Date,
-  GraphQLDateTime as DateTime,
-} from "graphql-iso-date";
-import { addMockFunctionsToSchema, makeExecutableSchema } from "graphql-tools";
-
-import { Mock } from "@projectcaluma/ember-testing/mirage-graphql";
-import typeDefs from "@projectcaluma/ember-testing/mirage-graphql/schema.graphql";
-
-export default function (server) {
-  return function ({ db }, request) {
-    const mocks = db._collections.reduce((m, { name }) => {
-      const cls = classify(singularize(name));
-      const mock = new Mock(cls, server);
-
-      return { ...m, ...mock.getHandlers() };
-    }, {});
-
-    const schema = makeExecutableSchema({
-      typeDefs,
-      resolvers: {
-        Date,
-        DateTime,
-        GenericScalar: {
-          serialize(value) {
-            return typeof value === "string" ? JSON.parse(value) : value;
-          },
-        },
-      },
-      resolverValidationOptions: { requireResolversForResolveType: false },
-    });
-
-    const { query, variables } = JSON.parse(request.requestBody);
-
-    addMockFunctionsToSchema({
-      schema,
-      mocks: {
-        ...mocks,
-        JSONString: () => JSON.stringify({}),
-        GenericScalar: () => ({}),
-        Node: (_, { id }) => ({ __typename: atob(id).split(":")[0] }),
-        SelectedOption: ({ value }) => {
-          const option = server.schema.options.findBy({ slug: value });
-
-          return {
-            slug: value,
-            label: option.label,
-            __typename: "SelectedOption",
-          };
-        },
-      },
-      preserveResolvers: false,
-    });
-
-    return graphql(schema, query, null, null, variables);
-  };
-}