chore: control test environments from travis file

ipfs · Sep 23, 2020 · 1a0ebfa · 1a0ebfa
1 parent 7bee6aa
commit 1a0ebfa
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 65 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -45,7 +45,7 @@ before_install:
   # only run jobs in packages that have changed since master in PR builds
   - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then export RUN_SINCE='--since master' ; fi
 
-script: npm run test:node -- $RUN_SINCE -- -- --timeout 10000 --bail
+script: npm run test -- $RUN_SINCE -- -- -t node --timeout 10000 --bail
 
 jobs:
   allow_failures:
@@ -69,62 +69,62 @@ jobs:
       addons:
         chrome: stable
       script:
-        - npm run test:browser -- $RUN_SINCE -- -- --bail
+        - npm run test -- $RUN_SINCE -- -- -t browser --bail
 
     - stage: test
       name: chrome webworker
       addons:
         chrome: stable
       script:
-        - npm run test:webworker -- $RUN_SINCE -- -- --bail
+        - npm run test -- $RUN_SINCE -- -- -t webworker --bail
 
     - stage: test
       name: firefox
       addons:
         firefox: latest
       script:
-        - npm run test:browser -- $RUN_SINCE -- -- --bail --browsers FirefoxHeadless
+        - npm run test -- $RUN_SINCE -- -- -t browser --bail --browsers FirefoxHeadless
 
     - stage: test
       name: firefox webworker
       addons:
         firefox: latest
       script:
-        - npm run test:webworker -- $RUN_SINCE -- -- --bail --browsers FirefoxHeadless
+        - npm run test -- $RUN_SINCE -- -- -t webworker --bail --browsers FirefoxHeadless
 
     - stage: test
       name: electron-main
       os: osx
       script:
-        - npm run test:electron-main -- $RUN_SINCE -- -- --bail
+        - npm run test -- $RUN_SINCE -- -- -t electron-main --bail
 
     - stage: test
       name: electron-renderer
       os: osx
       script:
-        - npm run test:electron-renderer -- $RUN_SINCE -- -- --bail
+        - npm run test -- $RUN_SINCE -- -- -t electron-renderer --bail
 
     - stage: test
       name: interop - node
       script:
-        - npm run test:interop:node -- $RUN_SINCE -- -- --bail
+        - npm run test:interop -- $RUN_SINCE -- -- -- -t node --bail
 
     - stage: test
       name: interop - browser
       script:
-        - npm run test:interop:browser -- $RUN_SINCE -- -- --bail
+        - npm run test:interop -- $RUN_SINCE -- -- -- -t browser --bail
 
     - stage: test
       name: interop - electron-main
       os: osx
       script:
-        - npm run test:interop:electron-main -- $RUN_SINCE -- -- --bail --timeout 10000
+        - npm run test:interop -- $RUN_SINCE -- -- -- -t electron-main -f ./test/node.js --bail --timeout 10000
 
     - stage: test
       name: interop - electron-renderer
       os: osx
       script:
-        - npm run test:interop:electron-renderer -- $RUN_SINCE -- -- --bail --timeout 10000
+        - npm run test:interop -- $RUN_SINCE -- -- -- -t electron-renderer -f ./test/browser.js -bail --timeout 10000
 
     - stage: test
       name: examples

diff --git a/package.json b/package.json
@@ -6,18 +6,9 @@
     "postinstall": "lerna bootstrap",
     "reset": "lerna run clean && rm -rf packages/*/node_modules node_modules",
     "test": "lerna run test",
-    "test:node": "lerna run test:node",
-    "test:browser": "lerna run test:browser",
-    "test:webworker": "lerna run test:webworker",
-    "test:electron": "lerna run test:electron",
-    "test:electron-main": "lerna run test:electron-main",
-    "test:electron-renderer": "lerna run test:electron-renderer",
     "test:external": "lerna run test:external",
     "test:cli": "lerna run test:cli",
-    "test:interop:node": "lerna run test:interop:node",
-    "test:interop:browser": "lerna run test:interop:browser",
-    "test:interop:electron-main": "lerna run test:interop:electron-main",
-    "test:interop:electron-renderer": "lerna run test:interop:electron-renderer",
+    "test:interop": "lerna run test:interop",
     "coverage": "lerna run coverage",
     "build": "lerna run build",
     "clean": "lerna run clean",

diff --git a/packages/interface-ipfs-core/package.json b/packages/interface-ipfs-core/package.json
@@ -15,7 +15,7 @@
   "scripts": {
     "lint": "aegir lint",
     "clean": "rm -rf ./dist",
-    "test": "exit 0",
+    "test": "echo 'No tests here'",
     "dep-check": "aegir dep-check"
   },
   "files": [

diff --git a/packages/ipfs-cli/package.json b/packages/ipfs-cli/package.json
@@ -14,18 +14,6 @@
     "dist"
   ],
   "main": "src/index.js",
-  "browser": {
-    "./src/core/runtime/init-assets-nodejs.js": "./src/core/runtime/init-assets-browser.js",
-    "./src/core/runtime/config-nodejs.js": "./src/core/runtime/config-browser.js",
-    "./src/core/runtime/dns-nodejs.js": "./src/core/runtime/dns-browser.js",
-    "./src/core/runtime/libp2p-nodejs.js": "./src/core/runtime/libp2p-browser.js",
-    "./src/core/runtime/libp2p-pubsub-routers-nodejs.js": "./src/core/runtime/libp2p-pubsub-routers-browser.js",
-    "./src/core/runtime/preload-nodejs.js": "./src/core/runtime/preload-browser.js",
-    "./src/core/runtime/repo-nodejs.js": "./src/core/runtime/repo-browser.js",
-    "./src/core/runtime/ipld-nodejs.js": "./src/core/runtime/ipld-browser.js",
-    "./test/utils/create-repo-nodejs.js": "./test/utils/create-repo-browser.js",
-    "ipfs-utils/src/files/glob-source": false
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ipfs/js-ipfs.git"

diff --git a/packages/ipfs-core-utils/package.json b/packages/ipfs-core-utils/package.json
@@ -17,10 +17,6 @@
   },
   "scripts": {
     "test": "aegir test",
-    "test:browser": "aegir test -t browser",
-    "test:node": "aegir test -t node",
-    "test:electron": "aegir test -t electron-main",
-    "test:electron-renderer": "aegir test -t electron-renderer",
     "lint": "aegir lint",
     "build": "aegir build",
     "clean": "rm -rf ./dist",

diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json
@@ -34,12 +34,6 @@
     "lint": "aegir lint",
     "build": "aegir build",
     "test": "aegir test",
-    "test:node": "aegir test -t node",
-    "test:browser": "aegir test -t browser",
-    "test:browser:http": "aegir test -t browser -f test/http-api/index.js",
-    "test:webworker": "aegir test -t webworker -- --timeout 10000",
-    "test:electron-main": "aegir test -t electron-main",
-    "test:electron-renderer": "aegir test -t electron-renderer",
     "test:bootstrapers": "IPFS_TEST=bootstrapers aegir test -t browser -f test/bootstrapers.js",
     "coverage": "nyc --reporter=text --reporter=lcov npm run test:node",
     "clean": "rm -rf ./dist",

diff --git a/packages/ipfs-http-client/package.json b/packages/ipfs-http-client/package.json
@@ -26,13 +26,6 @@
   },
   "scripts": {
     "test": "cross-env ECHO_SERVER_PORT=37490 aegir test",
-    "test:node": "cross-env ECHO_SERVER_PORT=37491 aegir test -t node",
-    "test:browser": "cross-env ECHO_SERVER_PORT=37492 aegir test -t browser",
-    "test:webworker": "cross-env ECHO_SERVER_PORT=37493 aegir test -t webworker",
-    "test:electron-main": "cross-env ECHO_SERVER_PORT=37494 aegir test -t electron-main",
-    "test:electron-renderer": "cross-env ECHO_SERVER_PORT=37495 aegir test -t electron-renderer",
-    "test:chrome": "cross-env ECHO_SERVER_PORT=37496 aegir test -t browser -t webworker -- --browsers ChromeHeadless",
-    "test:firefox": "cross-env ECHO_SERVER_PORT=37497 aegir test -t browser -t webworker -- --browsers FirefoxHeadless",
     "lint": "aegir lint",
     "build": "aegir build",
     "coverage": "npx nyc -r html npm run test:node -- --bail",

diff --git a/...s/ipfs-http-client/test/interface.spec.js → packages/ipfs-http-client/test/interface.js b/...s/ipfs-http-client/test/interface.spec.js → packages/ipfs-http-client/test/interface.js
@@ -593,6 +593,10 @@ describe('interface-ipfs-core tests', () => {
       {
         name: 'should receive multiple messages',
         reason: 'FIXME https://github.com/ipfs/interface-ipfs-core/pull/188#issuecomment-354673246 and https://github.com/ipfs/go-ipfs/issues/4778'
+      },
+      {
+        name: 'should publish and then resolve correctly',
+        reason: 'go behaviour is different to js'
       }
     ] : null
   })

diff --git a/packages/ipfs-http-client/test/node.js b/packages/ipfs-http-client/test/node.js
@@ -1,4 +1,5 @@
 'use strict'
+
 require('./node/swarm')
 require('./node/request-api')
 require('./node/custom-headers')
diff --git a/packages/ipfs-http-gateway/package.json b/packages/ipfs-http-gateway/package.json
@@ -21,7 +21,7 @@
   "scripts": {
     "lint": "aegir lint",
     "build": "aegir build",
-    "test": "aegir test -t node",
+    "test": "aegir test",
     "coverage": "nyc --reporter=text --reporter=lcov npm run test:node",
     "clean": "rm -rf ./dist",
     "dep-check": "aegir dep-check"

diff --git a/packages/ipfs-message-port-protocol/package.json b/packages/ipfs-message-port-protocol/package.json
@@ -20,11 +20,6 @@
   },
   "scripts": {
     "test": "aegir test",
-    "test:node": "aegir test -t node",
-    "test:browser": "aegir test -t browser",
-    "test:webworker": "aegir test -t webworker",
-    "test:chrome": "aegir test -t browser -t webworker -- --browsers ChromeHeadless",
-    "test:firefox": "aegir test -t browser -t webworker -- --browsers FirefoxHeadless",
     "lint": "aegir lint",
     "build": "aegir build",
     "coverage": "npx nyc -r html npm run test:node -- --bail",

diff --git a/packages/ipfs-message-port-server/package.json b/packages/ipfs-message-port-server/package.json
@@ -23,10 +23,6 @@
   },
   "scripts": {
     "test": "aegir test",
-    "test:browser": "aegir test -t browser",
-    "test:webworker": "aegir test -t webworker",
-    "test:chrome": "aegir test -t browser -t webworker -- --browsers ChromeHeadless",
-    "test:firefox": "aegir test -t browser -t webworker -- --browsers FirefoxHeadless",
     "lint": "aegir lint",
     "build": "aegir build",
     "coverage": "npx nyc -r html npm run test:node -- --bail",

diff --git a/packages/ipfs/package.json b/packages/ipfs/package.json
@@ -28,10 +28,6 @@
     "test:interface:core": "aegir test -f test/interface-core.js",
     "test:interface:http": "aegir test -f test/http-api/interface-http.js -- -t node",
     "test:interop": "cross-env IPFS_JS_EXEC=$PWD/src/cli.js IPFS_JS_MODULE=$PWD IPFS_JS_HTTP_MODULE=$PWD/../ipfs-http-client IPFS_REUSEPORT=false ipfs-interop",
-    "test:interop:node": "cross-env IPFS_JS_EXEC=$PWD/src/cli.js IPFS_JS_MODULE=$PWD IPFS_JS_HTTP_MODULE=$PWD/../ipfs-http-client IPFS_REUSEPORT=false ipfs-interop -- -t node",
-    "test:interop:browser": "cross-env IPFS_JS_EXEC=$PWD/src/cli.js IPFS_JS_MODULE=$PWD IPFS_JS_HTTP_MODULE=$PWD/../ipfs-http-client IPFS_REUSEPORT=false ipfs-interop -- -t browser",
-    "test:interop:electron-main": "cross-env IPFS_JS_EXEC=$PWD/src/cli.js IPFS_JS_MODULE=$PWD IPFS_JS_HTTP_MODULE=$PWD/../ipfs-http-client IPFS_REUSEPORT=false ipfs-interop -- -t electron-main -f ./test/node.js",
-    "test:interop:electron-renderer": "cross-env IPFS_JS_EXEC=$PWD/src/cli.js IPFS_JS_MODULE=$PWD IPFS_JS_HTTP_MODULE=$PWD/../ipfs-http-client IPFS_REUSEPORT=false ipfs-interop -- -t electron-renderer -f ./test/browser.js",
     "test:external": "aegir test-dependant",
     "coverage": "nyc --reporter=text --reporter=lcov npm run test:interface:core:node",
     "clean": "rm -rf ./dist",