getting test environments working

Author: SgtPooki

.aegir.cjs

@@ -1,10 +1,39 @@
+// import { MockServer } from './test/MockServer'
+
+// let mockServer = new MockServer()
+require('ts-node').register({
+  project: 'tsconfig.json',
+})
+const { MockServer } = require('./test/MockServer')
+
 /** @type {import('aegir').PartialOptions} */
 module.exports = {
+  docs: {
+    publish: true,
+    entryPoint: './'
+  },
   tsRepo: true,
   build: {
     config: {
       platform: 'node'
     },
     bundlesizeMax: '44KB'
+  },
+  test: {
+    async before () {
+
+    },
+    async beforeEach () {
+
+      // mockServer = new MockServer()
+      await mockServer.start()
+    },
+    async afterEach () {
+
+        await mockServer.stop()
+    },
+    async after () {
+
+    }
   }
 }

.envrc

@@ -3,3 +3,4 @@ use asdf
 export PATH=$(npm bin):${PATH}
 export MOCK_PINNING_SERVER_PORT=3000
 export MOCK_PINNING_SERVER_SECRET=secret
+export DEBUG=1

.gitignore

@@ -9,3 +9,5 @@ yarn.lock
 test/ts-use/tsconfig.tsbuildinfo
 test/tsconfig.tsbuildinfo
 package-lock.json
+*.bak
+.swc

fixtures.js

@@ -1,9 +1,9 @@
 
 // @ts-check
-export async function mochaGlobalSetup () {
+// export async function mochaGlobalSetup () {
 
-}
+// }
 
-export async function mochaGlobalTeardown () {
+// export async function mochaGlobalTeardown () {
 
-}
+// }

npm-scripts/fix/gen.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+main() {
+  # Get all generated files
+  # local FILES
+  # FILES=()
+  local SED_BACKUPS=()
+
+  # remove openapi-generator's package and tsconfig json files
+  for PKG_JSON in generated/*/package.json; do
+    rm $PKG_JSON
+  done
+  for TSC_JSON in generated/*/tsconfig.json; do
+    rm $TSC_JSON
+  done
+
+  for FILES_LIST in $(find generated/*/.openapi-generator/FILES); do
+    echo FILES_LIST = $FILES_LIST
+    for FILE in $(cat $FILES_LIST); do
+      local DIR=$(dirname $(dirname $FILES_LIST))
+      local FILE_PATH="${DIR}/${FILE}"
+      echo "FILE=${FILE_PATH}"
+
+      if test -e $FILE_PATH; then
+        # Replace all occurrances of "&lt;" with "<"
+        # Replace all occurrances of "&gt;" with ">"
+        sed -i .bak -e 's/&lt\;/\</g' -e 's/&gt\;/\>/g' $FILE_PATH
+        SED_BACKUPS+=( $FILE_PATH.bak )
+      fi
+    done
+  done
+
+
+  echo "SED_BACKUPS = ${SED_BACKUPS[@]}"
+  # test build.. if build succeeds, remove backup file.
+
+}
+
+
+main $@

package.json

@@ -12,6 +12,13 @@
   "bugs": {
     "url": "https://github.com/ipfs-shipyard/js-pinning-service-http-client/issues"
   },
+  "keywords": [
+    "dweb",
+    "ipfs",
+    "pinning service",
+    "protocol labs",
+    "web3"
+  ],
   "engines": {
     "node": ">=16.0.0",
     "npm": ">=7.0.0"
@@ -126,14 +133,17 @@
   "scripts": {
     "dep-check": "aegir dep-check src/**/*.ts test/**/*.ts generated/**/*.ts",
     "fix": "run-s fix:*",
-    "fix:gen": "./npm-scripts/fix/generated-code.sh",
+    "fix:gen": "./npm-scripts/fix/gen.sh",
     "fix:lint": "aegir lint --fix",
     "lint": "run-s lint:*",
     "lint:main": "aegir lint",
-    "lint:project": "check-aegir-project",
+    "lint:ts": "aegir ts -p check -- -p tsconfig.json --suppress 6133@generated 6192@generated --stats",
+    "lint-TODO:project": "check-aegir-project # currently broken due to corrupting the repoUrl",
     "release": "aegir release",
     "postinstall": "./npm-scripts/postinstall.sh",
     "build": "aegir build -- -p tsconfig.json --suppress 6133@generated 6192@generated --stats",
+    "build:main": "aegir build -- -p tsconfig.json --suppress 6133@generated 6192@generated --stats",
+    "build:docs": "aegir ts docs",
     "test": "run-p test:*",
     "test:electron": "aegir test --target electron-main",
     "test:node": "aegir test --target node --cov && npx nyc report",
@@ -150,18 +160,22 @@
   },
   "devDependencies": {
     "@openapitools/openapi-generator-cli": "^2.4.26",
-    "@types/collections": "^5.1.2",
+    "@swc/core": "^1.2.144",
+    "@swc/helpers": "^0.3.3",
     "@types/express": "^4.17.13",
     "@types/mocha": "^9.1.0",
     "@types/node": "^17.0.16",
     "@types/node-fetch": "^3.0.3",
+    "@types/portscanner": "^2.1.1",
     "aegir": "^36.1.3",
     "check-aegir-project": "^1.0.3",
-    "collections": "^5.1.13",
     "dotenvrc": "^1.0.1",
     "mock-ipfs-pinning-service": "^0.4.0",
     "npm-run-all": "^4.1.5",
     "openapi-typescript": "^5.1.1",
+    "portscanner": "^2.2.0",
+    "regenerator-runtime": "^0.13.9",
+    "ts-node": "^10.5.0",
     "tsc-silent": "^1.2.1"
   },
   "exports": {

test/MockServer.ts

@@ -77,7 +77,8 @@ export class MockServer {
       token: process.env.MOCK_PINNING_SERVER_SECRET
     })
 
-    return this._service
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+    return this._service as Application
   }
 
   private async server (port = this.port): Promise<Server> {

test/PinsApi.spec.ts

@@ -0,0 +1,19 @@
+/* eslint-disable no-console */
+
+import clientTests from './isomorphic-tests/client'
+import configurationTests from './isomorphic-tests/configuration'
+
+
+
+const setup = async () => {
+  return await new Promise<void>((resolve, reject) => {
+    void resolve()
+  })
+}
+
+// eslint-disable-next-line @typescript-eslint/no-misused-promises
+describe('browser', async (): Promise<void> => {
+  console.log(fetch)
+  await configurationTests(setup)
+  await clientTests(setup)
+})