Merge pull request #2151 from Human-Connection/2150_remove-graphql-request

Remove graphql-requests

.travis.yml

@@ -27,7 +27,7 @@ script:
   - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH"
   # Backend
   - docker-compose exec backend yarn run lint
-  - docker-compose exec backend yarn run test:jest --ci --verbose=false --coverage
+  - docker-compose exec backend yarn run test --ci --verbose=false --coverage
   - docker-compose exec backend yarn run db:seed
   - docker-compose exec backend yarn run db:reset
   # ActivityPub cucumber testing temporarily disabled because it's too buggy
@@ -37,7 +37,6 @@ script:
   # Frontend
   - docker-compose exec webapp yarn run lint
   - docker-compose exec webapp yarn run test --ci --verbose=false --coverage
-  - docker-compose exec -d backend yarn run test:before:seeder
   # Fullstack
   - docker-compose down
   - docker-compose -f docker-compose.yml up -d

backend/package.json

@@ -9,16 +9,9 @@
     "dev": "nodemon --exec babel-node src/ -e js,gql",
     "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/index.js -e js,gql",
     "lint": "eslint src --config .eslintrc.js",
-    "jest": "jest --forceExit --detectOpenHandles --runInBand",
-    "test": "run-s test:jest test:cucumber",
-    "test:before:server": "cross-env GRAPHQL_URI=http://localhost:4123 GRAPHQL_PORT=4123 yarn run dev 2> /dev/null",
-    "test:before:seeder": "cross-env GRAPHQL_URI=http://localhost:4001 GRAPHQL_PORT=4001 DISABLED_MIDDLEWARES=permissions,activityPub yarn run dev 2> /dev/null",
-    "test:jest:cmd": "wait-on tcp:4001 tcp:4123 && jest --forceExit --detectOpenHandles --runInBand",
+    "test": "jest --forceExit --detectOpenHandles --runInBand",
     "test:cucumber:cmd": "wait-on tcp:4001 tcp:4123 && cucumber-js --require-module @babel/register --exit test/",
-    "test:jest:cmd:debug": "wait-on tcp:4001 tcp:4123 && node --inspect-brk ./node_modules/.bin/jest -i --forceExit --detectOpenHandles --runInBand",
-    "test:jest": "run-p --race test:before:* \"test:jest:cmd {@}\" --",
     "test:cucumber": " cross-env CLIENT_URI=http://localhost:4123 run-p --race test:before:* 'test:cucumber:cmd {@}' --",
-    "test:jest:debug": "run-p --race test:before:* 'test:jest:cmd:debug {@}' --",
     "db:reset": "babel-node src/seed/reset-db.js",
     "db:seed": "babel-node src/seed/seed-db.js"
   },
@@ -127,7 +120,6 @@
     "eslint-plugin-prettier": "~3.1.1",
     "eslint-plugin-promise": "~4.2.1",
     "eslint-plugin-standard": "~4.0.1",
-    "graphql-request": "~1.8.2",
     "jest": "~24.9.0",
     "nodemon": "~1.19.4",
     "prettier": "~1.18.2",

backend/src/jest/helpers.js

@@ -1,21 +1,3 @@
-import { request } from 'graphql-request'
-
-// this is the to-be-tested server host
-// not to be confused with the seeder host
-export const host = 'http://127.0.0.1:4123'
-
-export async function login(variables) {
-  const mutation = `
-    mutation($email: String!, $password: String!) {
-      login(email: $email, password: $password)
-    }
-  `
-  const response = await request(host, mutation, variables)
-  return {
-    authorization: `Bearer ${response.login}`,
-  }
-}
-
 //* This is a fake ES2015 template string, just to benefit of syntax
 // highlighting of `gql` template strings in certain editors.
 export function gql(strings) {

backend/src/seed/factories/index.js

@@ -1,4 +1,3 @@
-import { GraphQLClient, request } from 'graphql-request'
 import { getDriver, neode } from '../../bootstrap/neo4j'
 import createBadge from './badges.js'
 import createUser from './users.js'
@@ -11,18 +10,6 @@ import createLocation from './locations.js'
 import createEmailAddress from './emailAddresses.js'
 import createUnverifiedEmailAddresss from './unverifiedEmailAddresses.js'
 
-export const seedServerHost = 'http://127.0.0.1:4001'
-
-const authenticatedHeaders = async ({ email, password }, host) => {
-  const mutation = `
-      mutation {
-        login(email:"${email}", password:"${password}")
-      }`
-  const response = await request(host, mutation)
-  return {
-    authorization: `Bearer ${response.login}`,
-  }
-}
 const factories = {
   Badge: createBadge,
   User: createUser,
@@ -48,127 +35,31 @@ export const cleanDatabase = async (options = {}) => {
 }
 
 export default function Factory(options = {}) {
-  const {
-    seedServerHost = 'http://127.0.0.1:4001',
-    neo4jDriver = getDriver(),
-    neodeInstance = neode(),
-  } = options
-
-  const graphQLClient = new GraphQLClient(seedServerHost)
+  const { neo4jDriver = getDriver(), neodeInstance = neode() } = options
 
   const result = {
     neo4jDriver,
-    seedServerHost,
-    graphQLClient,
     factories,
     lastResponse: null,
     neodeInstance,
-    async authenticateAs({ email, password }) {
-      const headers = await authenticatedHeaders(
-        {
-          email,
-          password,
-        },
-        seedServerHost,
-      )
-      this.lastResponse = headers
-      this.graphQLClient = new GraphQLClient(seedServerHost, {
-        headers,
-      })
-      return this
-    },
     async create(node, args = {}) {
-      const { factory, mutation, variables } = this.factories[node](args)
-      if (factory) {
-        this.lastResponse = await factory({
-          args,
-          neodeInstance,
-          factoryInstance: this,
-        })
-        return this.lastResponse
-      } else {
-        this.lastResponse = await this.graphQLClient.request(mutation, variables)
-      }
-      return this
-    },
-    async relate(node, relationship, { from, to }) {
-      const mutation = `
-        mutation {
-          Add${node}${relationship}(
-            from: { id: "${from}" },
-            to: { id: "${to}" }
-          ) { from { id } }
-        }
-      `
-      this.lastResponse = await this.graphQLClient.request(mutation)
-      return this
-    },
-    async mutate(mutation, variables) {
-      this.lastResponse = await this.graphQLClient.request(mutation, variables)
-      return this
-    },
-    async shout(properties) {
-      const { id, type } = properties
-      const mutation = `
-        mutation {
-          shout(
-            id: "${id}",
-            type: ${type}
-          )
-        }
-      `
-      this.lastResponse = await this.graphQLClient.request(mutation)
-      return this
-    },
-    async followUser(properties) {
-      const { id } = properties
-      const mutation = `
-        mutation {
-          followUser(
-            id: "${id}"
-          )
-        }
-      `
-      this.lastResponse = await this.graphQLClient.request(mutation)
-      return this
-    },
-    async invite({ email }) {
-      const mutation = ` mutation($email: String!) { invite( email: $email) } `
-      this.lastResponse = await this.graphQLClient.request(mutation, {
-        email,
+      const { factory } = this.factories[node](args)
+      this.lastResponse = await factory({
+        args,
+        neodeInstance,
+        factoryInstance: this,
       })
-      return this
+      return this.lastResponse
     },
+
     async cleanDatabase() {
       this.lastResponse = await cleanDatabase({
         driver: this.neo4jDriver,
       })
       return this
     },
-    async emote({ to, data }) {
-      const mutation = `
-        mutation {
-          AddPostEmotions(
-            to: { id: "${to}" },
-            data: { emotion: ${data} }
-          ) {
-            from { id }
-            to { id }
-            emotion
-          }
-        }
-      `
-      this.lastResponse = await this.graphQLClient.request(mutation)
-      return this
-    },
   }
-  result.authenticateAs.bind(result)
   result.create.bind(result)
-  result.relate.bind(result)
-  result.mutate.bind(result)
-  result.shout.bind(result)
-  result.followUser.bind(result)
-  result.invite.bind(result)
   result.cleanDatabase.bind(result)
   return result
 }

backend/yarn.lock

@@ -2776,14 +2776,6 @@ cross-env@~6.0.3:
   dependencies:
     cross-spawn "^7.0.0"
 
-cross-fetch@2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.2.tgz#a47ff4f7fc712daba8f6a695a11c948440d45723"
-  integrity sha1-pH/09/xxLauo9qaVoRyUhEDUVyM=
-  dependencies:
-    node-fetch "2.1.2"
-    whatwg-fetch "2.0.4"
-
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -4144,13 +4136,6 @@ graphql-middleware@~4.0.2:
   dependencies:
     graphql-tools "^4.0.5"
 
-graphql-request@~1.8.2:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-1.8.2.tgz#398d10ae15c585676741bde3fc01d5ca948f8fbe"
-  integrity sha512-dDX2M+VMsxXFCmUX0Vo0TopIZIX4ggzOtiCsThgtrKR4niiaagsGTDIHj3fsOMFETpa064vzovI+4YV4QnMbcg==
-  dependencies:
-    cross-fetch "2.2.2"
-
 graphql-shield@~7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/graphql-shield/-/graphql-shield-7.0.2.tgz#65d51528b4e36c4a5023276267abbd1abb57ce0b"
@@ -6173,11 +6158,6 @@ node-environment-flags@^1.0.5:
     object.getownpropertydescriptors "^2.0.3"
     semver "^5.7.0"
 
-node-fetch@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5"
-  integrity sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=
-
 node-fetch@^2.1.2, node-fetch@^2.2.0, node-fetch@~2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
@@ -8525,11 +8505,6 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   dependencies:
     iconv-lite "0.4.24"
 
-whatwg-fetch@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
-  integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
-
 whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"