fix(mirage): update mirage schema and fix generic scalar type

projectcaluma · May 22, 2019 · c1cdaa1 · c1cdaa1
1 parent 3c2bf1d
commit c1cdaa1
Show file tree

Hide file tree

Showing 8 changed files with 142 additions and 31 deletions.
diff --git a/addon-mirage-support/factories/form.js b/addon-mirage-support/factories/form.js
@@ -5,5 +5,5 @@ export default Factory.extend({
   slug: i => `form-${i + 1}`,
   description: () => faker.lorem.paragraph(),
   isArchived: false,
-  meta: JSON.stringify({})
+  meta: () => ({})
 });
diff --git a/addon-mirage-support/factories/option.js b/addon-mirage-support/factories/option.js
@@ -3,5 +3,5 @@ import { Factory } from "ember-cli-mirage";
 export default Factory.extend({
   slug: i => `option-${i + 1}`,
   label: i => `Option ${i + 1}`,
-  meta: JSON.stringify({})
+  meta: () => ({})
 });
diff --git a/addon-mirage-support/factories/question.js b/addon-mirage-support/factories/question.js
@@ -20,7 +20,7 @@ export default Factory.extend({
   isRequired: () => faker.random.boolean().toString(),
   isHidden: "false",
   isArchived: false,
-  meta: JSON.stringify({}),
+  meta: () => ({}),
 
   afterCreate(question, server) {
     if (["TEXT", "TEXTAREA"].includes(question.type)) {

diff --git a/addon/-private/fragment-types.js b/addon/-private/fragment-types.js
@@ -15,10 +15,7 @@ export default {
             name: "Document"
           },
           {
-            name: "FileAnswer"
-          },
-          {
-            name: "File"
+            name: "FormAnswer"
           },
           {
             name: "Case"
@@ -90,7 +87,10 @@ export default {
             name: "TableAnswer"
           },
           {
-            name: "FormAnswer"
+            name: "FileAnswer"
+          },
+          {
+            name: "File"
           },
           {
             name: "SimpleTask"
@@ -168,7 +168,7 @@ export default {
         name: "Answer",
         possibleTypes: [
           {
-            name: "FileAnswer"
+            name: "FormAnswer"
           },
           {
             name: "StringAnswer"
@@ -189,7 +189,7 @@ export default {
             name: "TableAnswer"
           },
           {
-            name: "FormAnswer"
+            name: "FileAnswer"
           }
         ]
       }

diff --git a/addon/mirage-graphql/handler.js b/addon/mirage-graphql/handler.js
@@ -27,8 +27,8 @@ export default function(server) {
       schema,
       mocks: {
         ...mocks,
-        JSONString: () => '{"foo": "bar"}',
-        GenericScalar: value => value,
+        JSONString: () => JSON.stringify({}),
+        GenericScalar: () => ({}),
         Node: (_, { id }) => ({ __typename: atob(id).split(":")[0] })
       },
       preserveResolvers: false

diff --git a/addon/mirage-graphql/resolvers/index.js b/addon/mirage-graphql/resolvers/index.js
@@ -1,5 +1,15 @@
 import { GraphQLDateTime } from "graphql-iso-date";
 
 export default {
-  DateTime: GraphQLDateTime
+  DateTime: GraphQLDateTime,
+  // generic scalar serializes from a string to an object but deserializes as
+  // object for some reason ¯\_(ツ)_/¯. But hey, it works!
+  GenericScalar: {
+    serialize(str) {
+      return typeof str === "string" ? JSON.parse(str) : str;
+    },
+    deserialize(obj) {
+      return obj;
+    }
+  }
 };