@projectcaluma/ember-testing 11.0.0-beta.3 → 11.0.0-beta.30

package/CHANGELOG.md

@@ -1,3 +1,89 @@
+# [@projectcaluma/ember-testing-v11.0.0-beta.11](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-testing-v11.0.0-beta.10...@projectcaluma/ember-testing-v11.0.0-beta.11) (2022-08-15)
+
+
+### Features
+
+* **testing:** add createdBy and modifiedBy filters ([c6ace21](https://github.com/projectcaluma/ember-caluma/commit/c6ace21c573d45da6f99c0bc2de076c507f4f056))
+* **testing:** allow inverting of filters ([88ab05d](https://github.com/projectcaluma/ember-caluma/commit/88ab05d4c01275e835d79c22451592666cec4db2))
+
+# [@projectcaluma/ember-testing-v11.0.0-beta.10](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-testing-v11.0.0-beta.9...@projectcaluma/ember-testing-v11.0.0-beta.10) (2022-08-05)
+
+
+* feat!: add multi file upload (#2040) ([c4fd004](https://github.com/projectcaluma/ember-caluma/commit/c4fd0049654b2d2e5ea62e5909a45d89cb888b40)), closes [#2040](https://github.com/projectcaluma/ember-caluma/issues/2040)
+
+
+### BREAKING CHANGES
+
+* This requires the caluma backend version v8.0.0-beta.12
+or later.
+
+# [@projectcaluma/ember-testing-v11.0.0-beta.9](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-testing-v11.0.0-beta.8...@projectcaluma/ember-testing-v11.0.0-beta.9) (2022-06-09)
+
+
+### Features
+
+* **caluma:** use new filter syntax of caluma ([7a00c03](https://github.com/projectcaluma/ember-caluma/commit/7a00c03a103933d9e48dd88adb7382441a298742))
+
+
+### BREAKING CHANGES
+
+* **caluma:** `ember-caluma` now requires Caluma version >=
+8.0.0-beta.6
+
+# [@projectcaluma/ember-testing-v11.0.0-beta.8](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-testing-v11.0.0-beta.7...@projectcaluma/ember-testing-v11.0.0-beta.8) (2022-05-13)
+
+
+### Features
+
+* **distribution:** add status for skipped inquiries ([1f93c92](https://github.com/projectcaluma/ember-caluma/commit/1f93c92d76b697954ec54aefa12348c84cd0abf9))
+
+# [@projectcaluma/ember-testing-v11.0.0-beta.7](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-testing-v11.0.0-beta.6...@projectcaluma/ember-testing-v11.0.0-beta.7) (2022-05-09)
+
+
+### Features
+
+* **distribution:** allow displaying more information in the answer ([9de7f01](https://github.com/projectcaluma/ember-caluma/commit/9de7f0149406a0a326ba59ca0abe27860a64f2a1))
+* **distribution:** improve edit and answer inquiry UI and UX ([6cd2dee](https://github.com/projectcaluma/ember-caluma/commit/6cd2dee45dde245064a0ac013160093bc783789c))
+
+# [@projectcaluma/ember-testing-v11.0.0-beta.6](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-testing-v11.0.0-beta.5...@projectcaluma/ember-testing-v11.0.0-beta.6) (2022-04-07)
+
+
+### Features
+
+* **cf-field:** add optional hints for form fields ([d847fbf](https://github.com/projectcaluma/ember-caluma/commit/d847fbffa376ea60971fb9e91aff8bf54ce77d50))
+* **distribution:** enable completing the distribution ([beabe61](https://github.com/projectcaluma/ember-caluma/commit/beabe61bd34025c4785c1e1ba60c59babb3eb6ab))
+
+
+### BREAKING CHANGES
+
+* **cf-field:** Question hints requires Caluma >= v7.15.0
+
+Add option to create hints for certain question types. These
+are displayed below the input field and can be used to provide
+short, informative messages. Hints are available for all question
+types except for form, static and action button questions.
+
+# [@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)
+
+
+### Features
+
+* **form-builder:** add new categories published and unpublished ([52c1c1d](https://github.com/projectcaluma/ember-caluma/commit/52c1c1deaf15991e595e042f643889be64b425a0))
+
 # [@projectcaluma/ember-testing-v11.0.0-beta.3](https://github.com/projectcaluma/ember-caluma/compare/@projectcaluma/ember-testing-v11.0.0-beta.2...@projectcaluma/ember-testing-v11.0.0-beta.3) (2022-02-16)
 
 

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,13 +1,11 @@
 import BaseFilter from "@projectcaluma/ember-testing/mirage-graphql/filters/base";
 
-export default class extends BaseFilter {
-  questions(records, value, { invert = false }) {
-    return records.filter(
-      (record) => invert !== value.includes(record.questionId)
-    );
+export default class AnswerFilter extends BaseFilter {
+  questions(records, value) {
+    return records.filter((record) => value.includes(record.questionId));
   }
 
-  question(records, value, { invert = false }) {
-    return this.questions(records, [value], { invert });
+  question(records, value) {
+    return this.questions(records, [value]);
   }
 }

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

@@ -1,36 +1,34 @@
 import { camelize } from "@ember/string";
 
-export default class {
+export default class BaseFilter {
   constructor(type) {
     this.type = type;
   }
 
   _getFilterFns(rawFilters) {
-    const filters = Array.isArray(rawFilters)
-      ? // new format
-        rawFilters
-          .filter((filter) => Object.keys(filter).length !== 0) // filter out empty filters
-          .map((filter) => {
-            const entries = Object.entries(filter);
-            const key = entries[0][0];
-            const value = entries[0][1];
-            const options = entries
-              .slice(1)
-              .reduce((opts, [k, v]) => ({ ...opts, [k]: v }), {});
-
-            return { key, value, options };
-          })
-      : // old format
-        Object.entries(rawFilters).map(([key, value]) => ({
-          key,
-          value,
-        }));
+    const filters = rawFilters
+      .filter((filter) => Object.keys(filter).length !== 0) // filter out empty filters
+      .map((filter) => {
+        const entries = Object.entries(filter);
+        const key = entries[0][0];
+        const value = entries[0][1];
+        const options = entries
+          .slice(1)
+          .reduce((opts, [k, v]) => ({ ...opts, [k]: v }), {});
+
+        return { key, value, options };
+      });
 
     return filters.map(({ key, value, options = {} }) => {
       const fn = this[key];
 
-      return typeof fn === "function"
-        ? (records) => fn.call(this, records, value, options)
+      return typeof fn === "function" && ![null, undefined].includes(value)
+        ? (records) => {
+            const filteredRecords = fn.call(this, records, value, options);
+            return options?.invert
+              ? records.filter((record) => !filteredRecords.includes(record))
+              : filteredRecords;
+          }
         : (records) => records;
     });
   }
@@ -53,7 +51,7 @@ export default class {
   }
 
   filter(records, filters) {
-    return this._getFilterFns(filters.filter ?? filters).reduce(
+    return this._getFilterFns(filters?.filter ?? []).reduce(
       (recs, fn) => fn(recs),
       this.sort(records, filters?.order)
     );
@@ -64,7 +62,27 @@ export default class {
   }
 
   slug(records, value) {
-    return records.filter(({ slug }) => slug === value);
+    return this.slugs(records, [value]);
+  }
+
+  slugs(records, values) {
+    return records.filter(({ slug }) => values.includes(slug));
+  }
+
+  createdByUser(records, value) {
+    return records.filter(({ createdByUser }) => createdByUser === value);
+  }
+
+  createdByGroup(records, value) {
+    return records.filter(({ createdByGroup }) => createdByGroup === value);
+  }
+
+  modifiedByUser(records, value) {
+    return records.filter(({ modifiedByUser }) => modifiedByUser === value);
+  }
+
+  modifiedByGroup(records, value) {
+    return records.filter(({ modifiedByGroup }) => modifiedByGroup === value);
   }
 
   id(records, value) {

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

@@ -1,10 +1,14 @@
 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);
   }
 
+  isPublished(records, value) {
+    return records.filter(({ isPublished }) => isPublished === value);
+  }
+
   search(records, value) {
     const re = new RegExp(`.*${value}.*`, "i");
 

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,27 +1,27 @@
 import BaseFilter from "@projectcaluma/ember-testing/mirage-graphql/filters/base";
 
-export default class extends BaseFilter {
-  status(records, value, { invert = false }) {
-    return records.filter(({ status }) => invert !== (status === value));
+export default class WorkItemFilter extends BaseFilter {
+  status(records, value) {
+    return records.filter(({ status }) => status === value);
   }
 
-  tasks(records, value, { invert = false }) {
-    return records.filter((record) => invert !== value.includes(record.taskId));
+  tasks(records, value) {
+    return records.filter((record) => value.includes(record.taskId));
   }
 
-  task(records, value, { invert = false }) {
-    return this.tasks(records, [value], { invert });
+  task(records, value) {
+    return this.tasks(records, [value]);
   }
 
-  controllingGroups(records, value, { invert = false }) {
+  controllingGroups(records, value) {
     return records.filter((record) =>
-      value.every((g) => invert !== record.controllingGroups?.includes(g))
+      value.every((g) => record.controllingGroups?.includes(g))
     );
   }
 
-  addressedGroups(records, value, { invert = false }) {
+  addressedGroups(records, value) {
     return records.filter((record) =>
-      value.every((g) => invert !== record.addressedGroups?.includes(g))
+      value.every((g) => record.addressedGroups?.includes(g))
     );
   }
 }

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 }
@@ -61,12 +61,12 @@ export default class extends BaseMock {
     });
   }
 
-  @register("SaveDocumentFileAnswerPayload")
-  handleSaveFileAnswer(_, { input }) {
+  @register("SaveDocumentFilesAnswerPayload")
+  handleSaveFilesAnswer(_, { input }) {
     return this._handleSaveDocumentAnswer(_, {
       ...input,
-      value: input.value ? { metadata: { object_name: input.value } } : null,
-      type: "FILE",
+      value: input.value ? [...input.value] : [],
+      type: "FILES",
     });
   }
 

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

@@ -3,16 +3,14 @@ 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",
-  "FILE",
+  "FILES",
   "FLOAT",
   "INTEGER",
   "LIST",
@@ -27,7 +25,7 @@ export const QUESTION_TYPES = [
   "DATE",
   "DYNAMIC_CHOICE",
   "DYNAMIC_MULTIPLE_CHOICE",
-  "FILE",
+  "FILES",
   "FLOAT",
   "FORM",
   "INTEGER",
@@ -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() {
@@ -193,7 +191,12 @@ export default class {
     _,
     { input: { clientMutationId = faker.datatype.uuid(), slug, id, ...args } }
   ) {
-    const identifier = slug ? { slug } : { id };
+    // Sometimes we pass the identifier as property `slug` (e.g in `saveForm`),
+    // sometimes as `id` (e.g. in `saveDocument`) and sometimes as the camelized
+    // name of the type (e.g in `saveWorkItem`).
+    const identifier = slug
+      ? { slug }
+      : { id: id ?? args[camelize(this.type)] };
 
     const relKeys = this.schema.modelFor(camelize(this.type)).foreignKeys;
 

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, _, {
@@ -92,10 +92,10 @@ export default class extends BaseMock {
     });
   }
 
-  @register("SaveFileQuestionPayload")
-  handleSaveFileQuestion(_, { input }) {
+  @register("SaveFilesQuestionPayload")
+  handleSaveFilesQuestion(_, { input }) {
     return this.handleSavePayload.fn.call(this, _, {
-      input: { ...input, type: "FILE" },
+      input: { ...input, type: "FILES" },
     });
   }
 }