From 8776237792a199e26322660d2d94cb066baa111b Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Mon, 3 Aug 2020 10:40:04 +0200 Subject: [PATCH 1/2] chore: consistent examples --- .../CHANGELOG.md | 0 .../README.md | 0 .../img/connect-1.png | Bin .../img/connect-2.png | Bin .../img/diagram.monopic | Bin .../img/diagram.txt | 0 .../img/fetch.png | Bin .../img/goal.png | Bin .../img/pubsub.png | Bin .../package.json | 0 .../public/app.css | 0 .../public/app.js | 0 .../public/assets/download.svg | 0 .../public/assets/ipfs-logo.svg | 0 .../public/assets/upload.svg | 0 .../public/favicon.ico | Bin .../public/index.html | 0 .../test.js | 0 .../README.md | 0 .../index.html | 0 .../package.json | 0 .../screenshot.png | Bin .../src/App.js | 0 .../src/index.js | 0 .../test.js | 0 25 files changed, 0 insertions(+), 0 deletions(-) rename examples/{exchange-files-in-browser => browser-exchange-files}/CHANGELOG.md (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/README.md (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/img/connect-1.png (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/img/connect-2.png (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/img/diagram.monopic (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/img/diagram.txt (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/img/fetch.png (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/img/goal.png (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/img/pubsub.png (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/package.json (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/public/app.css (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/public/app.js (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/public/assets/download.svg (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/public/assets/ipfs-logo.svg (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/public/assets/upload.svg (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/public/favicon.ico (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/public/index.html (100%) rename examples/{exchange-files-in-browser => browser-exchange-files}/test.js (100%) rename examples/{http-client-upload-file-via-browser => browser-http-client-upload-file}/README.md (100%) rename examples/{http-client-upload-file-via-browser => browser-http-client-upload-file}/index.html (100%) rename examples/{http-client-upload-file-via-browser => browser-http-client-upload-file}/package.json (100%) rename examples/{http-client-upload-file-via-browser => browser-http-client-upload-file}/screenshot.png (100%) rename examples/{http-client-upload-file-via-browser => browser-http-client-upload-file}/src/App.js (100%) rename examples/{http-client-upload-file-via-browser => browser-http-client-upload-file}/src/index.js (100%) rename examples/{http-client-upload-file-via-browser => browser-http-client-upload-file}/test.js (100%) diff --git a/examples/exchange-files-in-browser/CHANGELOG.md b/examples/browser-exchange-files/CHANGELOG.md similarity index 100% rename from examples/exchange-files-in-browser/CHANGELOG.md rename to examples/browser-exchange-files/CHANGELOG.md diff --git a/examples/exchange-files-in-browser/README.md b/examples/browser-exchange-files/README.md similarity index 100% rename from examples/exchange-files-in-browser/README.md rename to examples/browser-exchange-files/README.md diff --git a/examples/exchange-files-in-browser/img/connect-1.png b/examples/browser-exchange-files/img/connect-1.png similarity index 100% rename from examples/exchange-files-in-browser/img/connect-1.png rename to examples/browser-exchange-files/img/connect-1.png diff --git a/examples/exchange-files-in-browser/img/connect-2.png b/examples/browser-exchange-files/img/connect-2.png similarity index 100% rename from examples/exchange-files-in-browser/img/connect-2.png rename to examples/browser-exchange-files/img/connect-2.png diff --git a/examples/exchange-files-in-browser/img/diagram.monopic b/examples/browser-exchange-files/img/diagram.monopic similarity index 100% rename from examples/exchange-files-in-browser/img/diagram.monopic rename to examples/browser-exchange-files/img/diagram.monopic diff --git a/examples/exchange-files-in-browser/img/diagram.txt b/examples/browser-exchange-files/img/diagram.txt similarity index 100% rename from examples/exchange-files-in-browser/img/diagram.txt rename to examples/browser-exchange-files/img/diagram.txt diff --git a/examples/exchange-files-in-browser/img/fetch.png b/examples/browser-exchange-files/img/fetch.png similarity index 100% rename from examples/exchange-files-in-browser/img/fetch.png rename to examples/browser-exchange-files/img/fetch.png diff --git a/examples/exchange-files-in-browser/img/goal.png b/examples/browser-exchange-files/img/goal.png similarity index 100% rename from examples/exchange-files-in-browser/img/goal.png rename to examples/browser-exchange-files/img/goal.png diff --git a/examples/exchange-files-in-browser/img/pubsub.png b/examples/browser-exchange-files/img/pubsub.png similarity index 100% rename from examples/exchange-files-in-browser/img/pubsub.png rename to examples/browser-exchange-files/img/pubsub.png diff --git a/examples/exchange-files-in-browser/package.json b/examples/browser-exchange-files/package.json similarity index 100% rename from examples/exchange-files-in-browser/package.json rename to examples/browser-exchange-files/package.json diff --git a/examples/exchange-files-in-browser/public/app.css b/examples/browser-exchange-files/public/app.css similarity index 100% rename from examples/exchange-files-in-browser/public/app.css rename to examples/browser-exchange-files/public/app.css diff --git a/examples/exchange-files-in-browser/public/app.js b/examples/browser-exchange-files/public/app.js similarity index 100% rename from examples/exchange-files-in-browser/public/app.js rename to examples/browser-exchange-files/public/app.js diff --git a/examples/exchange-files-in-browser/public/assets/download.svg b/examples/browser-exchange-files/public/assets/download.svg similarity index 100% rename from examples/exchange-files-in-browser/public/assets/download.svg rename to examples/browser-exchange-files/public/assets/download.svg diff --git a/examples/exchange-files-in-browser/public/assets/ipfs-logo.svg b/examples/browser-exchange-files/public/assets/ipfs-logo.svg similarity index 100% rename from examples/exchange-files-in-browser/public/assets/ipfs-logo.svg rename to examples/browser-exchange-files/public/assets/ipfs-logo.svg diff --git a/examples/exchange-files-in-browser/public/assets/upload.svg b/examples/browser-exchange-files/public/assets/upload.svg similarity index 100% rename from examples/exchange-files-in-browser/public/assets/upload.svg rename to examples/browser-exchange-files/public/assets/upload.svg diff --git a/examples/exchange-files-in-browser/public/favicon.ico b/examples/browser-exchange-files/public/favicon.ico similarity index 100% rename from examples/exchange-files-in-browser/public/favicon.ico rename to examples/browser-exchange-files/public/favicon.ico diff --git a/examples/exchange-files-in-browser/public/index.html b/examples/browser-exchange-files/public/index.html similarity index 100% rename from examples/exchange-files-in-browser/public/index.html rename to examples/browser-exchange-files/public/index.html diff --git a/examples/exchange-files-in-browser/test.js b/examples/browser-exchange-files/test.js similarity index 100% rename from examples/exchange-files-in-browser/test.js rename to examples/browser-exchange-files/test.js diff --git a/examples/http-client-upload-file-via-browser/README.md b/examples/browser-http-client-upload-file/README.md similarity index 100% rename from examples/http-client-upload-file-via-browser/README.md rename to examples/browser-http-client-upload-file/README.md diff --git a/examples/http-client-upload-file-via-browser/index.html b/examples/browser-http-client-upload-file/index.html similarity index 100% rename from examples/http-client-upload-file-via-browser/index.html rename to examples/browser-http-client-upload-file/index.html diff --git a/examples/http-client-upload-file-via-browser/package.json b/examples/browser-http-client-upload-file/package.json similarity index 100% rename from examples/http-client-upload-file-via-browser/package.json rename to examples/browser-http-client-upload-file/package.json diff --git a/examples/http-client-upload-file-via-browser/screenshot.png b/examples/browser-http-client-upload-file/screenshot.png similarity index 100% rename from examples/http-client-upload-file-via-browser/screenshot.png rename to examples/browser-http-client-upload-file/screenshot.png diff --git a/examples/http-client-upload-file-via-browser/src/App.js b/examples/browser-http-client-upload-file/src/App.js similarity index 100% rename from examples/http-client-upload-file-via-browser/src/App.js rename to examples/browser-http-client-upload-file/src/App.js diff --git a/examples/http-client-upload-file-via-browser/src/index.js b/examples/browser-http-client-upload-file/src/index.js similarity index 100% rename from examples/http-client-upload-file-via-browser/src/index.js rename to examples/browser-http-client-upload-file/src/index.js diff --git a/examples/http-client-upload-file-via-browser/test.js b/examples/browser-http-client-upload-file/test.js similarity index 100% rename from examples/http-client-upload-file-via-browser/test.js rename to examples/browser-http-client-upload-file/test.js From ea5c8cbb8a45cec31ddfe74df22cc6ab3a90da20 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Tue, 4 Aug 2020 10:00:22 +0100 Subject: [PATCH 2/2] fix: do not depend on directory name for test type detection Node tests export a function, nightwatch tests export an object with string keys that are the test names, so if a module exports a function run it, otherwise treat it as a nightwatch test. --- examples/test-ipfs-example/test.js | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/examples/test-ipfs-example/test.js b/examples/test-ipfs-example/test.js index 42cd7947b7..f4c6554d28 100755 --- a/examples/test-ipfs-example/test.js +++ b/examples/test-ipfs-example/test.js @@ -22,14 +22,19 @@ testExample(dir) }) async function testExample (dir) { - //await installDeps(dir) await build(dir) - if (dir.includes('examples/browser-')) { - await runBrowserTest(dir) + const test = require(path.join(dir, 'test.js')) + + if (typeof test === 'function') { + console.info('Running tests in', dir) + + await test() } else { - await runNodeTest(dir) + await runBrowserTest(dir) } + + process.exit(0) } async function build (dir) { @@ -92,13 +97,3 @@ async function runBrowserTest (dir) { server.stop() } } - -async function runNodeTest (dir) { - console.info('Running node tests in', dir) - - const runTest = require(path.join(dir, 'test.js')) - - await runTest() - - process.exit(0) -}