tests: Remove numbers as keys of object

Author: IvanGoncharov

src/__tests__/starWarsData.js

@@ -6,105 +6,66 @@
  * JSON objects in a more complex demo.
  */
 
-const xwing = {
-  id: '1',
-  name: 'X-Wing',
-};
-
-const ywing = {
-  id: '2',
-  name: 'Y-Wing',
-};
-
-const awing = {
-  id: '3',
-  name: 'A-Wing',
-};
-
-// Yeah, technically it's Corellian. But it flew in the service of the rebels,
-// so for the purposes of this demo it's a rebel ship.
-const falcon = {
-  id: '4',
-  name: 'Millenium Falcon',
-};
-
-const homeOne = {
-  id: '5',
-  name: 'Home One',
-};
+type Ship = {|
+  id: string,
+  name: string,
+|};
 
-const tieFighter = {
-  id: '6',
-  name: 'TIE Fighter',
-};
+const allShips: Array<Ship> = [
+  { id: '1', name: 'X-Wing' },
+  { id: '2', name: 'Y-Wing' },
+  { id: '3', name: 'A-Wing' },
 
-const tieInterceptor = {
-  id: '7',
-  name: 'TIE Interceptor',
-};
+  // Yeah, technically it's Corellian. But it flew in the service of the rebels,
+  // so for the purposes of this demo it's a rebel ship.
+  { id: '4', name: 'Millenium Falcon' },
+  { id: '5', name: 'Home One' },
+  { id: '6', name: 'TIE Fighter' },
+  { id: '7', name: 'TIE Interceptor' },
+  { id: '8', name: 'Executor' },
+];
 
-const executor = {
-  id: '8',
-  name: 'Executor',
-};
+type Faction = {|
+  id: string,
+  name: string,
+  ships: Array<string>,
+|};
 
-const rebels = Object.freeze({
+const rebels: Faction = {
   id: '1',
   name: 'Alliance to Restore the Republic',
   ships: ['1', '2', '3', '4', '5'],
-});
+};
 
-const empire = Object.freeze({
+const empire: Faction = {
   id: '2',
   name: 'Galactic Empire',
   ships: ['6', '7', '8'],
-});
-
-const data = Object.freeze({
-  Faction: {
-    '1': rebels,
-    '2': empire,
-  },
-  Ship: {
-    '1': xwing,
-    '2': ywing,
-    '3': awing,
-    '4': falcon,
-    '5': homeOne,
-    '6': tieFighter,
-    '7': tieInterceptor,
-    '8': executor,
-  },
-});
-
-type Ship = {|
-  id: string,
-  name: string,
-|};
+};
 
-type Faction = {|
-  id: string,
-  name: string,
-  ships: $ReadOnlyArray<string>,
-|};
+const allFactions: Array<Faction> = [rebels, empire];
 
 let nextShip = 9;
 export function createShip(shipName: string, factionId: string): Ship {
   const newShip = {
     id: String(nextShip++),
     name: shipName,
   };
-  data.Ship[newShip.id] = newShip;
-  data.Faction[factionId].ships.push(newShip.id);
+
+  allShips.push(newShip);
+
+  const faction = allFactions.find((obj) => obj.id === factionId);
+  // eslint-disable-next-line no-unused-expressions
+  faction?.ships.push(newShip.id);
   return newShip;
 }
 
-export function getShip(id: string): Ship {
-  return data.Ship[id];
+export function getShip(id: string): Ship | void {
+  return allShips.find((ship) => ship.id === id);
 }
 
-export function getFaction(id: string): Faction {
-  return data.Faction[id];
+export function getFaction(id: string): Faction | void {
+  return allFactions.find((faction) => faction.id === id);
 }
 
 export function getRebels(): Faction {

src/node/__tests__/global.js

@@ -12,49 +12,49 @@ import {
 
 import { fromGlobalId, globalIdField, nodeDefinitions } from '../node';
 
-const userData = {
-  '1': {
-    id: 1,
+const userData = [
+  {
+    id: '1',
     name: 'John Doe',
   },
-  '2': {
-    id: 2,
+  {
+    id: '2',
     name: 'Jane Smith',
   },
-};
+];
 
-const photoData = {
-  '1': {
-    photoId: 1,
+const photoData = [
+  {
+    photoId: '1',
     width: 300,
   },
-  '2': {
-    photoId: 2,
+  {
+    photoId: '2',
     width: 400,
   },
-};
+];
 
-const postData = {
-  '1': {
-    id: 1,
+const postData = [
+  {
+    id: '1',
     text: 'lorem',
   },
-  '2': {
-    id: 2,
+  {
+    id: '2',
     text: 'ipsum',
   },
-};
+];
 
 const { nodeField, nodeInterface } = nodeDefinitions(
   (globalId) => {
     const { type, id } = fromGlobalId(globalId);
     switch (type) {
       case 'User':
-        return userData[id];
+        return userData.find((obj) => obj.id === id);
       case 'Photo':
-        return photoData[id];
+        return photoData.find((obj) => obj.photoId === id);
       case 'Post':
-        return postData[id];
+        return postData.find((obj) => obj.id === id);
     }
   },
   (obj) => {
@@ -111,14 +111,7 @@ const queryType = new GraphQLObjectType({
     node: nodeField,
     allObjects: {
       type: new GraphQLList(nodeInterface),
-      resolve: () => [
-        userData[1],
-        userData[2],
-        photoData[1],
-        photoData[2],
-        postData[1],
-        postData[2],
-      ],
+      resolve: () => [...userData, ...photoData, ...postData],
     },
   }),
 });

src/node/__tests__/node.js

@@ -13,44 +13,42 @@ import {
 
 import { nodeDefinitions } from '../node';
 
-const userData = {
-  '1': {
-    id: 1,
+const userData = [
+  {
+    id: '1',
     name: 'John Doe',
   },
-  '2': {
-    id: 2,
+  {
+    id: '2',
     name: 'Jane Smith',
   },
-};
+];
 
-const photoData = {
-  '3': {
-    id: 3,
+const photoData = [
+  {
+    id: '3',
     width: 300,
   },
-  '4': {
-    id: 4,
+  {
+    id: '4',
     width: 400,
   },
-};
+];
 
 const { nodeField, nodesField, nodeInterface } = nodeDefinitions(
   (id, _context, info) => {
     expect(info.schema).to.equal(schema);
-    if (userData[id]) {
-      return userData[id];
-    }
-    if (photoData[id]) {
-      return photoData[id];
-    }
+    return (
+      userData.find((obj) => obj.id === id) ??
+      photoData.find((obj) => obj.id === id)
+    );
   },
   (obj) => {
-    if (userData[obj.id]) {
+    if (userData.includes(obj)) {
       return userType;
     }
     // istanbul ignore else (Can't be reached)
-    if (photoData[obj.id]) {
+    if (photoData.includes(obj)) {
       return photoType;
     }
   },

src/node/__tests__/nodeasync.js

@@ -12,19 +12,19 @@ import {
 
 import { nodeDefinitions } from '../node';
 
-const userData = {
-  '1': {
-    id: 1,
+const userData = [
+  {
+    id: '1',
     name: 'John Doe',
   },
-  '2': {
-    id: 2,
+  {
+    id: '2',
     name: 'Jane Smith',
   },
-};
+];
 
 const { nodeField, nodeInterface } = nodeDefinitions(
-  (id) => userData[id],
+  (id) => userData.find((obj) => obj.id === id),
   () => userType,
 );