From 830af2b8cdbba1756ccb83d682a0271fa1738a4e Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Wed, 9 Oct 2019 18:15:19 +0100
Subject: [PATCH 01/17] test: adds automated tests to browser examples

---
 .gitignore                                    |   1 +
 .travis.yml                                   |  72 +++++
 examples/README.md                            |  24 ++
 .../browser-add-readable-stream/index.html    |   2 +-
 examples/browser-add-readable-stream/test.js  |  11 +
 examples/browser-browserify/package.json      |  13 +-
 examples/browser-browserify/public/index.html |   6 +-
 examples/browser-browserify/src/index.js      |  13 +-
 examples/browser-browserify/test.js           |  19 ++
 .../browser-create-react-app/package.json     |   2 +-
 examples/browser-create-react-app/src/App.js  |   4 +-
 .../src/hooks/use-ipfs-factory.js             |   2 +-
 examples/browser-create-react-app/test.js     |  16 ++
 examples/browser-mfs/package.json             |   2 +-
 examples/browser-mfs/test.js                  |  47 +++
 examples/browser-parceljs/test.js             |  15 +
 examples/browser-readablestream/test.js       | 269 ++++++++++++++++++
 examples/browser-script-tag/test.js           |  26 ++
 examples/browser-video-streaming/test.js      |  25 ++
 examples/browser-vue/test.js                  |  16 ++
 examples/browser-webpack/package.json         |   2 +
 examples/browser-webpack/server.js            |   3 +-
 examples/browser-webpack/test.js              |  18 ++
 examples/browser-webpack/webpack.config.js    |  11 +-
 examples/nightwatch.conf.js                   |  28 ++
 examples/package.json                         |  16 ++
 examples/test.js                              | 158 ++++++++++
 27 files changed, 797 insertions(+), 24 deletions(-)
 create mode 100644 examples/browser-add-readable-stream/test.js
 create mode 100644 examples/browser-browserify/test.js
 create mode 100644 examples/browser-create-react-app/test.js
 create mode 100644 examples/browser-mfs/test.js
 create mode 100644 examples/browser-parceljs/test.js
 create mode 100644 examples/browser-readablestream/test.js
 create mode 100644 examples/browser-script-tag/test.js
 create mode 100644 examples/browser-video-streaming/test.js
 create mode 100644 examples/browser-vue/test.js
 create mode 100644 examples/browser-webpack/test.js
 create mode 100644 examples/nightwatch.conf.js
 create mode 100644 examples/package.json
 create mode 100644 examples/test.js

diff --git a/.gitignore b/.gitignore
index d7223c6b87..17751ce051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ logs
 *.log
 # npm pack
 *.tgz
+**/tests_output
 
 coverage
 
diff --git a/.travis.yml b/.travis.yml
index 0250f38df7..4e111fb1ad 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -129,6 +129,78 @@ jobs:
       script:
         - npm run test:external -- service-worker-gateway https://github.com/ipfs-shipyard/service-worker-gateway.git
 
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: examples - browser-add-readable-stream
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- browser-add-readable-stream
+
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: examples - browser-browserify
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- browser-browserify
+
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: examples - browser-create-react-app
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- browser-create-react-app
+
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: examples - browser-mfs
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- browser-mfs
+
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: examples - browser-parceljs
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- browser-parceljs
+
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: examples - browser-readablestream
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- browser-readablestream
+
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: examples - browser-script-tag
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- browser-script-tag
+
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: examples - browser-vue
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- browser-vue
+
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: examples - browser-webpack
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- browser-webpack
+
     - stage: tag
       # only run on changes to master
       if: branch = master AND type = push AND fork = false
diff --git a/examples/README.md b/examples/README.md
index 364977886a..ba3af3eae2 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -49,3 +49,27 @@ In this section, you will find explanations to different pieces of IPFS Architec
 - Storing and Retrieving blocks (soon™)
 - IPLD (InterPlanetary Linked-Data) (soon™)
 - IPFS Networking - Managing your swarm, libp2p and more (soon™)
+
+## Adding new examples
+
+All examples should include a `test.js` file.  The implementation will differ depending on if your example is intended to run under node or the browser.
+
+### Browser `test.js`
+
+All browser examples should either be a whole webapp or a simple demo.
+
+#### Webapp
+
+Webapps must have a `package.json` that contains a `build` script.  This script should place all assets in a folder named `dist` including an `index.html` file.  During testing this will have a web server run over it using `http-server`.
+
+#### Simple demo
+
+Simple demos must have an `index.html` file in the root of the demo folder.  This file will be loaded in a browser and tested via a `file://` URL.
+
+#### Browser `test.js`
+
+Your `test.js` file should contain a [Nightwatch](https://www.npmjs.com/package/nightwatch) scenario that will be executed.  The URL to example will be present in the `IPFS_EXAMPLE_TEST_URL` environmental variable when the test is run.
+
+### Node
+
+...
diff --git a/examples/browser-add-readable-stream/index.html b/examples/browser-add-readable-stream/index.html
index dffc1ceed2..0a8fc03004 100644
--- a/examples/browser-add-readable-stream/index.html
+++ b/examples/browser-add-readable-stream/index.html
@@ -1,7 +1,7 @@
 <html>
   <body>
     <pre id="output"></pre>
-    <script src="https://unpkg.com/ipfs/dist/index.js"></script>
+    <script src="../../dist/index.js"></script>
     <script src="index.js"></script>
   </body>
 </html>
diff --git a/examples/browser-add-readable-stream/test.js b/examples/browser-add-readable-stream/test.js
new file mode 100644
index 0000000000..3c33a61135
--- /dev/null
+++ b/examples/browser-add-readable-stream/test.js
@@ -0,0 +1,11 @@
+'use strict'
+
+module.exports = {
+  'Add readable stream example': function (browser) {
+    browser
+      .url(process.env.IPFS_EXAMPLE_TEST_URL)
+      .waitForElementVisible('#output')
+      .assert.containsText('#output', 'directory/ QmVgJePRxp1vhRxDcJWdmuFGfUB5S5RYTtG1NR3bQM4BBn')
+      .end()
+  }
+}
\ No newline at end of file
diff --git a/examples/browser-browserify/package.json b/examples/browser-browserify/package.json
index c534b6030b..cd72814280 100644
--- a/examples/browser-browserify/package.json
+++ b/examples/browser-browserify/package.json
@@ -4,17 +4,20 @@
   "description": "Bundle js-ipfs with Browserify",
   "main": "index.js",
   "scripts": {
-    "bundle": "browserify src/index.js > public/bundle.js",
+    "build": "browserify src/index.js > public/bundle.js",
     "serve": "http-server public -a 127.0.0.1 -p 8888",
-    "start": "npm run bundle && npm run serve"
+    "start": "npm run build && npm run serve"
   },
   "keywords": [],
   "license": "MIT",
   "devDependencies": {
-    "ipfs": "file:../../",
     "browserify": "^16.2.3",
     "concat-stream": "^2.0.0",
-    "http-server": "~0.11.1"
+    "http-server": "~0.11.1",
+    "ipfs": "file:../../"
   },
-  "dependencies": {}
+  "dependencies": {},
+  "browser": {
+    "ipfs": "ipfs/dist"
+  }
 }
diff --git a/examples/browser-browserify/public/index.html b/examples/browser-browserify/public/index.html
index a2ea58def4..041385a09d 100644
--- a/examples/browser-browserify/public/index.html
+++ b/examples/browser-browserify/public/index.html
@@ -14,9 +14,9 @@
   </head>
   <body>
     <h1>JS IPFS - Add data to IPFS from the browser</h1>
-    <textarea id="source"></textarea>
-    <button id="store">add to ipfs</button>
-    <div>
+    <textarea id="source" placeholder="Enter some text here"></textarea>
+    <button id="store">Add text to ipfs</button>
+    <div id="output" style="display: none">
       <div>found in ipfs:</div>
       <div class="content" id="hash">[ipfs hash]</div>
       <div class="content" id="content">[ipfs content]</div>
diff --git a/examples/browser-browserify/src/index.js b/examples/browser-browserify/src/index.js
index afea210ea0..af565ae325 100644
--- a/examples/browser-browserify/src/index.js
+++ b/examples/browser-browserify/src/index.js
@@ -9,22 +9,23 @@ document.addEventListener('DOMContentLoaded', async () => {
 
   async function store () {
     const toStore = document.getElementById('source').value
+    const result = await node.add(toStore)
 
-    const res = await node.add(toStore)
-
-    res.forEach((file) => {
+    for (const file of result) {
       if (file && file.hash) {
         console.log('successfully stored', file.hash)
-        display(file.hash)
+
+        await display(file.hash)
       }
-    })
+    }
   }
 
   async function display (hash) {
-    // buffer: true results in the returned result being a buffer rather than a stream
     const data = await node.cat(hash)
+
     document.getElementById('hash').innerText = hash
     document.getElementById('content').innerText = data
+    document.getElementById('output').setAttribute('style', 'display: block')
   }
 
   document.getElementById('store').onclick = store
diff --git a/examples/browser-browserify/test.js b/examples/browser-browserify/test.js
new file mode 100644
index 0000000000..363a17fa58
--- /dev/null
+++ b/examples/browser-browserify/test.js
@@ -0,0 +1,19 @@
+'use strict'
+
+const pkg = require('./package.json')
+
+module.exports = {
+  [pkg.name]: function (browser) {
+    browser
+      .url(process.env.IPFS_EXAMPLE_TEST_URL)
+      .waitForElementVisible('#source')
+      .setValue('#source', 'hello')
+      .waitForElementVisible('#store')
+      .pause(1000)
+      .click('#store')
+      .waitForElementVisible('#output')
+      .assert.containsText('#hash', 'QmWfVY9y3xjsixTgbd9AorQxH7VtMpzfx2HaWtsoUYecaX')
+      .assert.containsText('#content', 'hello')
+      .end()
+  }
+}
diff --git a/examples/browser-create-react-app/package.json b/examples/browser-create-react-app/package.json
index be623e00d0..37734fb3e3 100644
--- a/examples/browser-create-react-app/package.json
+++ b/examples/browser-create-react-app/package.json
@@ -8,7 +8,7 @@
     "ipfs-css": "^0.13.1",
     "react": "^16.8.0",
     "react-dom": "^16.8.0",
-    "react-scripts": "3.1.1",
+    "react-scripts": "^3.2.0",
     "tachyons": "^4.11.1"
   },
   "scripts": {
diff --git a/examples/browser-create-react-app/src/App.js b/examples/browser-create-react-app/src/App.js
index 8d8a20d483..f742be5208 100755
--- a/examples/browser-create-react-app/src/App.js
+++ b/examples/browser-create-react-app/src/App.js
@@ -36,12 +36,12 @@ const IpfsId = (props) => {
   if (!props) return null
   return (
     <section className='bg-snow mw7 center mt5'>
-      <h1 className='f3 fw4 ma0 pv3 aqua montserrat tc'>Connected to IPFS</h1>
+      <h1 className='f3 fw4 ma0 pv3 aqua montserrat tc' data-test='title'>Connected to IPFS</h1>
       <div className='pa4'>
         {['id', 'agentVersion'].map((key) => (
           <div className='mb4' key={key}>
             <Title>{key}</Title>
-            <div className='bg-white pa2 br2 truncate monospace'>{props[key]}</div>
+            <div className='bg-white pa2 br2 truncate monospace' data-test={key}>{props[key]}</div>
           </div>
         ))}
       </div>
diff --git a/examples/browser-create-react-app/src/hooks/use-ipfs-factory.js b/examples/browser-create-react-app/src/hooks/use-ipfs-factory.js
index 31c88fe08e..fa0464d484 100644
--- a/examples/browser-create-react-app/src/hooks/use-ipfs-factory.js
+++ b/examples/browser-create-react-app/src/hooks/use-ipfs-factory.js
@@ -25,7 +25,7 @@ export default function useIpfsFactory ({ commands }) {
     return function cleanup () {
       if (ipfs && ipfs.stop) {
         console.log('Stopping IPFS')
-        ipfs.stop()
+        ipfs.stop().catch(err => console.error(err))
         setIpfsReady(false)
       }
     }
diff --git a/examples/browser-create-react-app/test.js b/examples/browser-create-react-app/test.js
new file mode 100644
index 0000000000..812769aca0
--- /dev/null
+++ b/examples/browser-create-react-app/test.js
@@ -0,0 +1,16 @@
+'use strict'
+
+const pkg = require('./package.json')
+
+module.exports = {
+  [pkg.name]: function (browser) {
+    browser
+      .url(process.env.IPFS_EXAMPLE_TEST_URL)
+      .waitForElementVisible('[data-test=title]')
+      .assert.containsText('[data-test=title]', 'Connected to IPFS')
+      .assert.elementPresent('[data-test=id')
+      .assert.elementPresent('[data-test=agentVersion')
+      .end()
+  }
+}
+
diff --git a/examples/browser-mfs/package.json b/examples/browser-mfs/package.json
index c6558793c8..47dc9915a2 100644
--- a/examples/browser-mfs/package.json
+++ b/examples/browser-mfs/package.json
@@ -18,7 +18,7 @@
     "webpack-cli": "^3.0.8"
   },
   "dependencies": {
-    "ipfs": "../../",
+    "ipfs": "file:../../",
     "mime-sniffer": "~0.0.3"
   }
 }
diff --git a/examples/browser-mfs/test.js b/examples/browser-mfs/test.js
new file mode 100644
index 0000000000..ca4cdf4ae0
--- /dev/null
+++ b/examples/browser-mfs/test.js
@@ -0,0 +1,47 @@
+'use strict'
+
+const pkg = require('./package.json')
+
+module.exports = {
+  [pkg.name]: function (browser) {
+    browser
+      .url(process.env.IPFS_EXAMPLE_TEST_URL)
+      .waitForElementNotVisible('#modal-screen')
+      .waitForElementVisible('#log')
+
+    browser.expect.element('#log').text.to.contain('IPFS: Drop some files into this window to get started').before(30000)
+
+    browser.waitForElementVisible('#button-mkdir')
+      .click('#button-mkdir')
+      .waitForElementVisible('#form-mkdir-path')
+      .clearValue('#form-mkdir-path')
+      .setValue('#form-mkdir-path', '/folder')
+      .click('#button-form-mkdir-submit')
+
+    browser.expect.element('#files').text.to.contain('folder/').before(30000)
+
+    browser.click('#button-cp')
+      .waitForElementVisible('#form-cp-path')
+      .clearValue('#form-cp-path')
+      .setValue('#form-cp-path', '/folder')
+      .clearValue('#form-cp-dest')
+      .setValue('#form-cp-dest', '/folder-copy')
+      .click('#button-form-cp-submit')
+
+    browser.expect.element('#files').text.to.contain('folder-copy/').before(30000)
+
+    browser.click('#button-mv')
+      .waitForElementVisible('#form-mv-path')
+      .clearValue('#form-mv-path')
+      .setValue('#form-mv-path', '/folder')
+      .clearValue('#form-mv-dest')
+      .setValue('#form-mv-dest', '/folder-other')
+      .click('#button-form-mv-submit')
+
+    browser.expect.element('#files').text.to.not.contain('folder/').before(30000)
+    browser.expect.element('#files').text.to.contain('folder-other/').before(30000)
+
+    browser.end()
+  }
+}
+
diff --git a/examples/browser-parceljs/test.js b/examples/browser-parceljs/test.js
new file mode 100644
index 0000000000..6f30ea9a8c
--- /dev/null
+++ b/examples/browser-parceljs/test.js
@@ -0,0 +1,15 @@
+'use strict'
+
+const pkg = require('./package.json')
+
+module.exports = {
+  [pkg.name]: function (browser) {
+    browser
+      .url(process.env.IPFS_EXAMPLE_TEST_URL)
+      .waitForElementVisible('#output')
+
+    browser.expect.element('#output').text.to.contain('The contents of the file was: Hello from parcel.js bundled ipfs example').before(30000)
+
+    browser.end()
+  }
+}
diff --git a/examples/browser-readablestream/test.js b/examples/browser-readablestream/test.js
new file mode 100644
index 0000000000..d6a6cd9a87
--- /dev/null
+++ b/examples/browser-readablestream/test.js
@@ -0,0 +1,269 @@
+'use strict'
+
+const pkg = require('./package.json')
+
+module.exports = {
+  [pkg.name]: function (browser) {
+    browser
+      .url(process.env.IPFS_EXAMPLE_TEST_URL)
+      .waitForElementVisible('#output')
+
+    browser.expect.element('#output').text.to.contain('IPFS: Then press the "Go!" button to start playing a video').before(30000)
+
+    browser.executeAsync(async function (done) {
+      const container = document.querySelector('#container')
+
+      // fake dropping a file
+      container.ondrop({
+        preventDefault: () => {},
+        dataTransfer: {
+          items: [{
+            kind: 'file',
+            getAsFile: () => {
+              // actually an .mp4 file, believe it or not
+              return [
+                0x00, 0x00, 0x00, 0x14, 0x66, 0x74, 0x79, 0x70,
+                0x71, 0x74, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00,
+                0x71, 0x74, 0x20, 0x20, 0x00, 0x00, 0x00, 0x08,
+                0x77, 0x69, 0x64, 0x65, 0x00, 0x00, 0x00, 0xe0,
+                0x6d, 0x64, 0x61, 0x74, 0x00, 0x00, 0x00, 0x15,
+                0x06, 0x05, 0x11, 0x03, 0x87, 0xf4, 0x4e, 0xcd,
+                0x0a, 0x4b, 0xdc, 0xa1, 0x94, 0x3a, 0xc3, 0xd4,
+                0x9b, 0x17, 0x1f, 0x00, 0x80, 0x00, 0x00, 0x00,
+                0x23, 0x25, 0xb8, 0x08, 0x02, 0x02, 0x7f, 0xfa,
+                0x78, 0x1f, 0x03, 0xf4, 0x82, 0x9f, 0xb9, 0xc6,
+                0x5f, 0xef, 0x65, 0x2b, 0x9e, 0x18, 0xe1, 0x93,
+                0xfb, 0xfb, 0x3a, 0x7f, 0x3f, 0x5d, 0x6c, 0xe9,
+                0x20, 0xb9, 0x16, 0xe0, 0x00, 0x00, 0x00, 0x31,
+                0x25, 0x12, 0xe0, 0x20, 0x08, 0x09, 0xff, 0xfa,
+                0x78, 0x1f, 0x03, 0xf4, 0x82, 0x9f, 0xb9, 0xc6,
+                0x5f, 0xef, 0x65, 0x2b, 0x9e, 0x18, 0xe1, 0x93,
+                0xfb, 0xfb, 0x3a, 0x7f, 0x24, 0x94, 0x7d, 0x69,
+                0xbf, 0x5d, 0xcd, 0xe6, 0xa6, 0xc0, 0xf0, 0xa7,
+                0x91, 0xa8, 0x7c, 0x09, 0x66, 0xdf, 0x20, 0x89,
+                0xae, 0x00, 0x00, 0x00, 0x15, 0x06, 0x05, 0x11,
+                0x03, 0x87, 0xf4, 0x4e, 0xcd, 0x0a, 0x4b, 0xdc,
+                0xa1, 0x94, 0x3a, 0xc3, 0xd4, 0x9b, 0x17, 0x1f,
+                0x00, 0x80, 0x00, 0x00, 0x00, 0x08, 0x21, 0xe1,
+                0x09, 0x10, 0x4f, 0xfe, 0xaa, 0x8c, 0x00, 0x00,
+                0x00, 0x09, 0x21, 0x13, 0x84, 0x24, 0x41, 0x3f,
+                0xfe, 0xaa, 0x8c, 0x00, 0x00, 0x00, 0x15, 0x06,
+                0x05, 0x11, 0x03, 0x87, 0xf4, 0x4e, 0xcd, 0x0a,
+                0x4b, 0xdc, 0xa1, 0x94, 0x3a, 0xc3, 0xd4, 0x9b,
+                0x17, 0x1f, 0x00, 0x80, 0x00, 0x00, 0x00, 0x08,
+                0x01, 0xa8, 0x81, 0x62, 0x08, 0xff, 0x20, 0x20,
+                0x00, 0x00, 0x00, 0x08, 0x01, 0x12, 0xa2, 0x05,
+                0x88, 0x23, 0x20, 0x20, 0x00, 0x00, 0x05, 0xa6,
+                0x6d, 0x6f, 0x6f, 0x76, 0x00, 0x00, 0x00, 0x6c,
+                0x6d, 0x76, 0x68, 0x64, 0x00, 0x00, 0x00, 0x00,
+                0xd9, 0xc3, 0xbb, 0x69, 0xd9, 0xc3, 0xbb, 0x69,
+                0x00, 0x00, 0x17, 0x70, 0x00, 0x00, 0x00, 0x68,
+                0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+                0x00, 0x00, 0x03, 0xc0, 0x74, 0x72, 0x61, 0x6b,
+                0x00, 0x00, 0x00, 0x5c, 0x74, 0x6b, 0x68, 0x64,
+                0x00, 0x00, 0x00, 0x0f, 0xd9, 0xc3, 0xbb, 0x69,
+                0xd9, 0xc3, 0xbb, 0x69, 0x00, 0x00, 0x00, 0x01,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+                0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x40, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00,
+                0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44,
+                0x74, 0x61, 0x70, 0x74, 0x00, 0x00, 0x00, 0x14,
+                0x63, 0x6c, 0x65, 0x66, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x38, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x14, 0x70, 0x72, 0x6f, 0x66,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00,
+                0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14,
+                0x65, 0x6e, 0x6f, 0x66, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x38, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x24, 0x65, 0x64, 0x74, 0x73,
+                0x00, 0x00, 0x00, 0x1c, 0x65, 0x6c, 0x73, 0x74,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+                0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x02, 0x62,
+                0x6d, 0x64, 0x69, 0x61, 0x00, 0x00, 0x00, 0x20,
+                0x6d, 0x64, 0x68, 0x64, 0x00, 0x00, 0x00, 0x00,
+                0xd9, 0xc3, 0xbb, 0x69, 0xd9, 0xc3, 0xbb, 0x69,
+                0x00, 0x00, 0x17, 0x70, 0x00, 0x00, 0x01, 0x2c,
+                0x55, 0xc4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x31,
+                0x68, 0x64, 0x6c, 0x72, 0x00, 0x00, 0x00, 0x00,
+                0x6d, 0x68, 0x6c, 0x72, 0x76, 0x69, 0x64, 0x65,
+                0x61, 0x70, 0x70, 0x6c, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x10, 0x43, 0x6f, 0x72,
+                0x65, 0x20, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x20,
+                0x56, 0x69, 0x64, 0x65, 0x6f, 0x00, 0x00, 0x02,
+                0x09, 0x6d, 0x69, 0x6e, 0x66, 0x00, 0x00, 0x00,
+                0x14, 0x76, 0x6d, 0x68, 0x64, 0x00, 0x00, 0x00,
+                0x01, 0x00, 0x40, 0x80, 0x00, 0x80, 0x00, 0x80,
+                0x00, 0x00, 0x00, 0x00, 0x38, 0x68, 0x64, 0x6c,
+                0x72, 0x00, 0x00, 0x00, 0x00, 0x64, 0x68, 0x6c,
+                0x72, 0x61, 0x6c, 0x69, 0x73, 0x61, 0x70, 0x70,
+                0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x17, 0x43, 0x6f, 0x72, 0x65, 0x20, 0x4d,
+                0x65, 0x64, 0x69, 0x61, 0x20, 0x44, 0x61, 0x74,
+                0x61, 0x20, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65,
+                0x72, 0x00, 0x00, 0x00, 0x24, 0x64, 0x69, 0x6e,
+                0x66, 0x00, 0x00, 0x00, 0x1c, 0x64, 0x72, 0x65,
+                0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x01, 0x00, 0x00, 0x00, 0x0c, 0x61, 0x6c, 0x69,
+                0x73, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01,
+                0x91, 0x73, 0x74, 0x62, 0x6c, 0x00, 0x00, 0x00,
+                0xb6, 0x73, 0x74, 0x73, 0x64, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+                0xa6, 0x61, 0x76, 0x63, 0x31, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
+                0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x38, 0x00,
+                0x34, 0x00, 0x48, 0x00, 0x00, 0x00, 0x48, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x05,
+                0x48, 0x2e, 0x32, 0x36, 0x34, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x18, 0xff, 0xff, 0x00, 0x00, 0x00, 0x2a, 0x61,
+                0x76, 0x63, 0x43, 0x01, 0x4d, 0x40, 0x0a, 0xff,
+                0xe1, 0x00, 0x13, 0x27, 0x4d, 0x40, 0x0a, 0xa9,
+                0x18, 0x84, 0xf2, 0xcf, 0x80, 0xb5, 0x01, 0x01,
+                0x01, 0x30, 0xad, 0x7b, 0xdf, 0x01, 0x01, 0x00,
+                0x04, 0x28, 0xfe, 0x09, 0x88, 0x00, 0x00, 0x00,
+                0x12, 0x63, 0x6f, 0x6c, 0x72, 0x6e, 0x63, 0x6c,
+                0x63, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00,
+                0x00, 0x00, 0x10, 0x70, 0x61, 0x73, 0x70, 0x00,
+                0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x73,
+                0x74, 0x74, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00,
+                0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x28, 0x63,
+                0x74, 0x74, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
+                0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x01, 0xff,
+                0xff, 0xff, 0x9c, 0x00, 0x00, 0x00, 0x20, 0x63,
+                0x73, 0x6c, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x64, 0xff, 0xff, 0xff, 0x9c, 0x00,
+                0x00, 0x00, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x01, 0x2c, 0x00, 0x00, 0x00, 0x14, 0x73,
+                0x74, 0x73, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00,
+                0x00, 0x00, 0x0f, 0x73, 0x64, 0x74, 0x70, 0x00,
+                0x00, 0x00, 0x00, 0x20, 0x10, 0x18, 0x00, 0x00,
+                0x00, 0x1c, 0x73, 0x74, 0x73, 0x63, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+                0x00, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,
+                0x00, 0x01, 0x00, 0x00, 0x00, 0x20, 0x73, 0x74,
+                0x73, 0x7a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,
+                0x00, 0x75, 0x00, 0x00, 0x00, 0x32, 0x00, 0x00,
+                0x00, 0x31, 0x00, 0x00, 0x00, 0x14, 0x73, 0x74,
+                0x63, 0x6f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x01, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00,
+                0x00, 0x92, 0x6d, 0x65, 0x74, 0x61, 0x00, 0x00,
+                0x00, 0x22, 0x68, 0x64, 0x6c, 0x72, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6d, 0x64,
+                0x74, 0x61, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x38, 0x6b, 0x65, 0x79, 0x73,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+                0x00, 0x00, 0x00, 0x28, 0x6d, 0x64, 0x74, 0x61,
+                0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c,
+                0x65, 0x2e, 0x71, 0x75, 0x69, 0x63, 0x6b, 0x74,
+                0x69, 0x6d, 0x65, 0x2e, 0x70, 0x69, 0x78, 0x65,
+                0x6c, 0x64, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x79,
+                0x00, 0x00, 0x00, 0x30, 0x69, 0x6c, 0x73, 0x74,
+                0x00, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x01,
+                0x00, 0x00, 0x00, 0x20, 0x64, 0x61, 0x74, 0x61,
+                0x00, 0x00, 0x00, 0x1e, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x34,
+                0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x1a,
+                0x00, 0x00, 0x01, 0x72, 0x6d, 0x65, 0x74, 0x61,
+                0x00, 0x00, 0x00, 0x22, 0x68, 0x64, 0x6c, 0x72,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x6d, 0x64, 0x74, 0x61, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x00, 0x00, 0x00, 0x00, 0x9d, 0x6b, 0x65,
+                0x79, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                0x00, 0x04, 0x00, 0x00, 0x00, 0x20, 0x6d, 0x64,
+                0x74, 0x61, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70,
+                0x70, 0x6c, 0x65, 0x2e, 0x71, 0x75, 0x69, 0x63,
+                0x6b, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x6d, 0x61,
+                0x6b, 0x65, 0x00, 0x00, 0x00, 0x21, 0x6d, 0x64,
+                0x74, 0x61, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x70,
+                0x70, 0x6c, 0x65, 0x2e, 0x71, 0x75, 0x69, 0x63,
+                0x6b, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x6d, 0x6f,
+                0x64, 0x65, 0x6c, 0x00, 0x00, 0x00, 0x24, 0x6d,
+                0x64, 0x74, 0x61, 0x63, 0x6f, 0x6d, 0x2e, 0x61,
+                0x70, 0x70, 0x6c, 0x65, 0x2e, 0x71, 0x75, 0x69,
+                0x63, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x73,
+                0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00,
+                0x00, 0x00, 0x28, 0x6d, 0x64, 0x74, 0x61, 0x63,
+                0x6f, 0x6d, 0x2e, 0x61, 0x70, 0x70, 0x6c, 0x65,
+                0x2e, 0x71, 0x75, 0x69, 0x63, 0x6b, 0x74, 0x69,
+                0x6d, 0x65, 0x2e, 0x63, 0x72, 0x65, 0x61, 0x74,
+                0x69, 0x6f, 0x6e, 0x64, 0x61, 0x74, 0x65, 0x00,
+                0x00, 0x00, 0xab, 0x69, 0x6c, 0x73, 0x74, 0x00,
+                0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, 0x01, 0x00,
+                0x00, 0x00, 0x15, 0x64, 0x61, 0x74, 0x61, 0x00,
+                0x00, 0x00, 0x01, 0x47, 0x42, 0x15, 0xc7, 0x41,
+                0x70, 0x70, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x26,
+                0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x1e,
+                0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x01,
+                0x47, 0x42, 0x15, 0xc7, 0x4d, 0x61, 0x63, 0x42,
+                0x6f, 0x6f, 0x6b, 0x50, 0x72, 0x6f, 0x31, 0x34,
+                0x2c, 0x32, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00,
+                0x00, 0x03, 0x00, 0x00, 0x00, 0x28, 0x64, 0x61,
+                0x74, 0x61, 0x00, 0x00, 0x00, 0x01, 0x47, 0x42,
+                0x15, 0xc7, 0x4d, 0x61, 0x63, 0x20, 0x4f, 0x53,
+                0x20, 0x58, 0x20, 0x31, 0x30, 0x2e, 0x31, 0x34,
+                0x2e, 0x36, 0x20, 0x28, 0x31, 0x38, 0x47, 0x39,
+                0x35, 0x29, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00,
+                0x00, 0x04, 0x00, 0x00, 0x00, 0x28, 0x64, 0x61,
+                0x74, 0x61, 0x00, 0x00, 0x00, 0x01, 0x47, 0x42,
+                0x15, 0xc7, 0x32, 0x30, 0x31, 0x39, 0x2d, 0x31,
+                0x30, 0x2d, 0x30, 0x39, 0x54, 0x31, 0x37, 0x3a,
+                0x32, 0x38, 0x3a, 0x35, 0x38, 0x2b, 0x30, 0x31,
+                0x30, 0x30
+              ]
+            }
+          }]
+        }
+      })
+
+      done()
+    })
+
+    browser.expect.element('#output').text.to.contain('IPFS: Added ').before(30000)
+
+    browser.click('#gobutton')
+      .executeAsync(function (done) {
+        const video = document.getElementById('video')
+        video.addEventListener('canplay', function () {
+          done()
+        })
+
+        setTimeout(() => {
+          done('Did not start streaming video after 1m')
+        }, 60000)
+      }, [], (result) => {
+        if (result.value) {
+          throw new Error(result.value)
+        }
+      })
+
+    browser.end()
+  }
+}
+
+
diff --git a/examples/browser-script-tag/test.js b/examples/browser-script-tag/test.js
new file mode 100644
index 0000000000..8ea632085d
--- /dev/null
+++ b/examples/browser-script-tag/test.js
@@ -0,0 +1,26 @@
+'use strict'
+
+module.exports = {
+  'Browser script tag': function (browser) {
+    browser
+      .url(process.env.IPFS_EXAMPLE_TEST_URL)
+      .executeAsync(function (done) {
+        let count = 0
+        const interval = setInterval(() => {
+          if (count === 10 || window.node) {
+            clearInterval(interval)
+
+            done(window.node ? null : 'Did not load node after 10s')
+          }
+
+          count++
+        }, 1000)
+      }, [], (result) => {
+        if (result.value) {
+          throw new Error(result.value)
+        }
+      })
+
+    browser.end()
+  }
+}
diff --git a/examples/browser-video-streaming/test.js b/examples/browser-video-streaming/test.js
new file mode 100644
index 0000000000..11da73ec59
--- /dev/null
+++ b/examples/browser-video-streaming/test.js
@@ -0,0 +1,25 @@
+'use strict'
+
+module.exports = {
+  'Browser video streaming': function (browser) {
+    browser
+      .url(process.env.IPFS_EXAMPLE_TEST_URL)
+      .waitForElementPresent('#video')
+      .executeAsync(function (done) {
+        const video = document.getElementById('video')
+        video.addEventListener('canplay', function () {
+          done()
+        })
+
+        setTimeout(() => {
+          done('Did not start streaming video after 1m')
+        }, 60000)
+      }, [], (result) => {
+        if (result.value) {
+          throw new Error(result.value)
+        }
+      })
+
+    browser.end()
+  }
+}
diff --git a/examples/browser-vue/test.js b/examples/browser-vue/test.js
new file mode 100644
index 0000000000..bd542d6afe
--- /dev/null
+++ b/examples/browser-vue/test.js
@@ -0,0 +1,16 @@
+'use strict'
+
+const pkg = require('./package.json')
+
+module.exports = {
+  [pkg.name]: function (browser) {
+    browser
+      .url(process.env.IPFS_EXAMPLE_TEST_URL)
+      .waitForElementVisible('.ipfs-info')
+
+    browser.expect.element('.ipfs-info h1').text.to.contain('Connected to IPFS').before(30000)
+
+    browser.end()
+  }
+}
+
diff --git a/examples/browser-webpack/package.json b/examples/browser-webpack/package.json
index 350476b19a..c30a7ef004 100644
--- a/examples/browser-webpack/package.json
+++ b/examples/browser-webpack/package.json
@@ -3,6 +3,7 @@
   "version": "1.0.0",
   "description": "Bundle js-ipfs with WebPack",
   "scripts": {
+    "build": "webpack",
     "start": "node server.js"
   },
   "license": "MIT",
@@ -12,6 +13,7 @@
     "@babel/preset-env": "^7.2.3",
     "@babel/preset-react": "^7.0.0",
     "babel-loader": "^8.0.5",
+    "copy-webpack-plugin": "^5.0.4",
     "react": "^16.7.0",
     "react-dom": "^16.7.0",
     "react-hot-loader": "^4.8.8",
diff --git a/examples/browser-webpack/server.js b/examples/browser-webpack/server.js
index 0b4a68fcf6..4a1a8ebdfb 100644
--- a/examples/browser-webpack/server.js
+++ b/examples/browser-webpack/server.js
@@ -5,12 +5,11 @@ const WebpackDevServer = require('webpack-dev-server')
 const config = require('./webpack.config')
 
 const wds = new WebpackDevServer(webpack(config), {
-  publicPath: config.output.publicPath,
   hot: true,
   historyApiFallback: true
 })
 
-wds.listen(3000, 'localhost', (err, result) => {
+wds.listen(3000, 'localhost', (err) => {
   if (err) {
     throw err
   }
diff --git a/examples/browser-webpack/test.js b/examples/browser-webpack/test.js
new file mode 100644
index 0000000000..a4ac18a2f2
--- /dev/null
+++ b/examples/browser-webpack/test.js
@@ -0,0 +1,18 @@
+'use strict'
+
+const pkg = require('./package.json')
+
+module.exports = {
+  [pkg.name]: function (browser) {
+    browser
+      .url(process.env.IPFS_EXAMPLE_TEST_URL)
+      .waitForElementVisible('#root h1')
+
+    browser.expect.element('#root h1').text.to.contain('Everything is working!').before(30000)
+    browser.expect.element('#root').text.to.contain('Added a file!').before(30000)
+    browser.expect.element('#root').text.to.contain('hello world from webpacked IPFS').before(30000)
+
+    browser.end()
+  }
+}
+
diff --git a/examples/browser-webpack/webpack.config.js b/examples/browser-webpack/webpack.config.js
index c12a025963..de12448fe9 100644
--- a/examples/browser-webpack/webpack.config.js
+++ b/examples/browser-webpack/webpack.config.js
@@ -2,6 +2,7 @@
 
 var path = require('path')
 var webpack = require('webpack')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
 
 module.exports = {
   devtool: 'eval',
@@ -12,11 +13,17 @@ module.exports = {
   ],
   output: {
     path: path.join(__dirname, 'dist'),
-    filename: 'bundle.js',
+    filename: 'static/bundle.js',
     publicPath: '/static/'
   },
   plugins: [
-    new webpack.HotModuleReplacementPlugin()
+    new webpack.HotModuleReplacementPlugin(),
+    new CopyWebpackPlugin([{
+      from: 'index.html'
+    }, {
+      from: 'img',
+      to: 'static/img'
+    }])
   ],
   module: {
     rules: [
diff --git a/examples/nightwatch.conf.js b/examples/nightwatch.conf.js
new file mode 100644
index 0000000000..4420adf897
--- /dev/null
+++ b/examples/nightwatch.conf.js
@@ -0,0 +1,28 @@
+'use strict'
+
+// config used to test examples
+module.exports = {
+  src_folders: ['tests'],
+
+  webdriver: {
+    start_process: true,
+    server_path: 'node_modules/.bin/chromedriver',
+    port: 9515
+  },
+
+  test_settings: {
+    default: {
+      desiredCapabilities: {
+        browserName: 'chrome',
+        chromeOptions: {
+          args: ['headless']
+        }
+      }
+    }
+  },
+
+  globals: {
+    asyncHookTimeout: 120000,
+    waitForConditionTimeout: 60000
+  }
+}
diff --git a/examples/package.json b/examples/package.json
new file mode 100644
index 0000000000..b8c5639cf7
--- /dev/null
+++ b/examples/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "ipfs-examples",
+  "version": "1.0.0",
+  "description": "Examples of how to use IPFS",
+  "scripts": {
+    "test": "node ./test.js"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "chromedriver": "^77.0.0",
+    "execa": "^2.1.0",
+    "fs-extra": "^8.1.0",
+    "http-server": "~0.11.1",
+    "nightwatch": "^1.2.4"
+  }
+}
diff --git a/examples/test.js b/examples/test.js
new file mode 100644
index 0000000000..1ef669b01f
--- /dev/null
+++ b/examples/test.js
@@ -0,0 +1,158 @@
+'use strict'
+
+const fs = require('fs-extra')
+const path = require('path')
+const execa = require('execa')
+const dir = path.join(__dirname, process.argv[2])
+
+testExample(dir)
+  .then(() => {}, (err) => { throw err })
+
+async function testExample (dir) {
+  //await installDeps(dir)
+  //await build(dir)
+
+  if (dir.includes('examples/browser-')) {
+    await runBrowserTest(dir)
+  } else {
+    await runNodeTest(dir)
+  }
+}
+
+async function installDeps (dir) {
+  if (!fs.existsSync(path.join(dir, 'package.json'))) {
+    console.info('Nothing to install in', dir)
+    return
+  }
+
+  const proc = execa.command('npm install', {
+    cwd: dir
+  })
+  proc.all.on('data', (data) => {
+    process.stdout.write(data)
+  })
+
+  await proc
+}
+
+async function build (dir) {
+  if (!fs.existsSync(path.join(dir, 'package.json'))) {
+    console.info('Nothing to build in', dir)
+    return
+  }
+
+  const proc = execa.command('npm run build', {
+    cwd: dir,
+    env: {
+      ...process.env,
+      CI: true // needed for some "clever" build tools
+    }
+  })
+  proc.all.on('data', (data) => {
+    process.stdout.write(data)
+  })
+
+  await proc
+}
+
+async function runBrowserTest (dir) {
+  console.info('Running browser tests in', dir)
+
+  const {
+    stopServer,
+    serverUrl
+  } = await startServer(dir)
+
+  console.info('Running tests at', serverUrl)
+
+  const proc = execa('nightwatch', [ path.join(dir, 'test.js') ], {
+    cwd: __dirname,
+    env: {
+      ...process.env,
+      CI: true,
+      IPFS_EXAMPLE_TEST_URL: serverUrl
+    }
+  })
+  proc.all.on('data', (data) => {
+    process.stdout.write(data)
+  })
+
+  try {
+    await proc
+  } finally {
+    stopServer()
+  }
+}
+
+async function runNodeTest (dir) {
+  console.info('Running node tests in', dir)
+}
+
+async function startServer (dir) {
+  async function serveFrom (path) {
+    return new Promise((resolve, reject) => {
+      let output = ''
+
+      const proc = execa.command(`http-server ${path} -a 127.0.0.1`, {
+        cwd: __dirname
+      })
+      proc.all.on('data', (data) => {
+        process.stdout.write(data)
+
+        const line = data.toString('utf8')
+        output += line
+
+        if (output.includes('Hit CTRL-C to stop the server')) {
+          // find the port
+          const port = output.match(/http:\/\/127.0.0.1:(\d+)/)[1]
+
+          if (!port) {
+            throw new Error(`Could not find port in ${output}`)
+          }
+
+          resolve({
+            stopServer: () => {
+              console.info('Stopping server')
+              proc.kill('SIGINT', {
+                forceKillAfterTimeout: 2000
+              })
+            },
+            serverUrl: `http://127.0.0.1:${port}`
+          })
+        }
+      })
+
+      proc.then(() => {}, (err) => reject(err))
+    })
+  }
+
+  // start something..
+  const serverPaths = [
+    path.join(dir, 'build'),
+    path.join(dir, 'dist'),
+    path.join(dir, 'public')
+  ]
+
+  for (const p of serverPaths) {
+    if (fs.existsSync(p)) {
+      return serveFrom(p)
+    }
+  }
+
+  const files = [
+    path.join(dir, 'index.html')
+  ]
+
+  for (const f of files) {
+    if (fs.existsSync(f)) {
+      console.info('Found', f)
+
+      return Promise.resolve({
+        serverUrl: `file://${f}`,
+        stopServer: () => {}
+      })
+    }
+  }
+
+  throw new Error('Browser examples must contain a `public`, `dist` or `build` folder or an `index.html` file')
+}

From 953b50159dff2e6d00a87bf0b973b06866e2786b Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Wed, 9 Oct 2019 20:29:07 +0100
Subject: [PATCH 02/17] chore: upgrade chrome

---
 .travis.yml      | 4 ++++
 examples/test.js | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4e111fb1ad..f135be8082 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,10 @@ addons:
       # Fixes error while loading shared libraries: libgconf-2.so.4: cannot open shared object file: No such file or directory
       # https://github.com/electron/electron/issues/1518
       - libgconf-2-4
+      # Ensure chrome is the latest version
+      # https://stackoverflow.com/questions/57903415/travis-ci-chrome-62-instead-of-77
+      - dpkg
+  chrome: stable
 
 script: npx nyc -s npx aegir test -t node --timeout 10000 --bail
 after_success:
diff --git a/examples/test.js b/examples/test.js
index 1ef669b01f..c9d3646b88 100644
--- a/examples/test.js
+++ b/examples/test.js
@@ -1,5 +1,9 @@
 'use strict'
 
+process.on('unhandledPromiseRejection', (err) => {
+  throw err
+})
+
 const fs = require('fs-extra')
 const path = require('path')
 const execa = require('execa')
@@ -9,8 +13,8 @@ testExample(dir)
   .then(() => {}, (err) => { throw err })
 
 async function testExample (dir) {
-  //await installDeps(dir)
-  //await build(dir)
+  await installDeps(dir)
+  await build(dir)
 
   if (dir.includes('examples/browser-')) {
     await runBrowserTest(dir)

From 001fc9c23d0763ff765cf0c6cbda30928746bf3d Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Wed, 9 Oct 2019 20:43:56 +0100
Subject: [PATCH 03/17] chore: throw on unhandled rejection

---
 .travis.yml                 | 18 +++++++++---------
 examples/nightwatch.conf.js |  4 ++++
 examples/test.js            |  4 ----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f135be8082..2f4425a500 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,26 +78,26 @@ jobs:
         - npx aegir test -t electron-renderer --bail --timeout 10000
 
     - stage: test
-      name: interop node
+      name: interop - node
       script:
         - cd node_modules/ipfs-interop
         - IPFS_JS_EXEC=./../../src/cli/bin.js IPFS_REUSEPORT=false npx aegir test -t node --bail
 
     - stage: test
-      name: interop browser
+      name: interop - browser
       script:
         - cd node_modules/ipfs-interop
         - IPFS_JS_EXEC=./../../src/cli/bin.js IPFS_REUSEPORT=false npx aegir test -t browser --bail
 
     - stage: test
-      name: interop electron-main
+      name: interop - electron-main
       os: osx
       script:
         - cd node_modules/ipfs-interop
         - IPFS_JS_EXEC=./../../src/cli/bin.js IPFS_REUSEPORT=false npx aegir test -t electron-main -f ./test/node.js --bail --timeout 10000
 
     - stage: test
-      name: interop electron-renderer
+      name: interop - electron-renderer
       os: osx
       script:
         - cd node_modules/ipfs-interop
@@ -105,31 +105,31 @@ jobs:
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: ipfs-companion
+      name: external - ipfs-companion
       script:
         - npm run test:external -- ipfs-companion https://github.com/ipfs-shipyard/ipfs-companion.git
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: npm-on-ipfs
+      name: external - npm-on-ipfs
       script:
         - npm run test:external -- npm-on-ipfs https://github.com/ipfs-shipyard/npm-on-ipfs.git
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: ipfs-pubsub-room
+      name: external - ipfs-pubsub-room
       script:
         - npm run test:external -- ipfs-pubsub-room https://github.com/ipfs-shipyard/ipfs-pubsub-room.git
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: peer-base
+      name: external - peer-base
       script:
         - npm run test:external -- peer-base https://github.com/peer-base/peer-base.git
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: service-worker-gateway
+      name: external - service-worker-gateway
       script:
         - npm run test:external -- service-worker-gateway https://github.com/ipfs-shipyard/service-worker-gateway.git
 
diff --git a/examples/nightwatch.conf.js b/examples/nightwatch.conf.js
index 4420adf897..1f489273c8 100644
--- a/examples/nightwatch.conf.js
+++ b/examples/nightwatch.conf.js
@@ -1,5 +1,9 @@
 'use strict'
 
+process.on('unhandledPromiseRejection', (err) => {
+  throw err
+})
+
 // config used to test examples
 module.exports = {
   src_folders: ['tests'],
diff --git a/examples/test.js b/examples/test.js
index c9d3646b88..b8da2b0661 100644
--- a/examples/test.js
+++ b/examples/test.js
@@ -1,9 +1,5 @@
 'use strict'
 
-process.on('unhandledPromiseRejection', (err) => {
-  throw err
-})
-
 const fs = require('fs-extra')
 const path = require('path')
 const execa = require('execa')

From 50e4ad337d199bfa356d46ab4813efee0ed0c3a2 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Wed, 9 Oct 2019 21:01:23 +0100
Subject: [PATCH 04/17] fix: fail if FAILED is in output

---
 .travis.yml                 | 18 +++++++++---------
 examples/nightwatch.conf.js |  4 ----
 examples/test.js            |  6 +++++-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2f4425a500..6a6c2b250e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -135,7 +135,7 @@ jobs:
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: examples - browser-add-readable-stream
+      name: example - browser-add-readable-stream
       script:
         - cd examples
         - npm install
@@ -143,7 +143,7 @@ jobs:
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: examples - browser-browserify
+      name: example - browser-browserify
       script:
         - cd examples
         - npm install
@@ -151,7 +151,7 @@ jobs:
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: examples - browser-create-react-app
+      name: example - browser-create-react-app
       script:
         - cd examples
         - npm install
@@ -159,7 +159,7 @@ jobs:
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: examples - browser-mfs
+      name: example - browser-mfs
       script:
         - cd examples
         - npm install
@@ -167,7 +167,7 @@ jobs:
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: examples - browser-parceljs
+      name: example - browser-parceljs
       script:
         - cd examples
         - npm install
@@ -175,7 +175,7 @@ jobs:
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: examples - browser-readablestream
+      name: example - browser-readablestream
       script:
         - cd examples
         - npm install
@@ -183,7 +183,7 @@ jobs:
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: examples - browser-script-tag
+      name: example - browser-script-tag
       script:
         - cd examples
         - npm install
@@ -191,7 +191,7 @@ jobs:
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: examples - browser-vue
+      name: example - browser-vue
       script:
         - cd examples
         - npm install
@@ -199,7 +199,7 @@ jobs:
 
     - stage: test
       if: branch =~ /^release\/.*$/
-      name: examples - browser-webpack
+      name: example - browser-webpack
       script:
         - cd examples
         - npm install
diff --git a/examples/nightwatch.conf.js b/examples/nightwatch.conf.js
index 1f489273c8..4420adf897 100644
--- a/examples/nightwatch.conf.js
+++ b/examples/nightwatch.conf.js
@@ -1,9 +1,5 @@
 'use strict'
 
-process.on('unhandledPromiseRejection', (err) => {
-  throw err
-})
-
 // config used to test examples
 module.exports = {
   src_folders: ['tests'],
diff --git a/examples/test.js b/examples/test.js
index b8da2b0661..506e30a6f0 100644
--- a/examples/test.js
+++ b/examples/test.js
@@ -78,7 +78,11 @@ async function runBrowserTest (dir) {
   })
 
   try {
-    await proc
+    const result = await proc
+
+    if (result.stderr.includes('FAILED')) {
+      throw new Error('Tests failed')
+    }
   } finally {
     stopServer()
   }

From ba015c9c7062cf49ddbb564a2ea7e3d215e871c1 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Wed, 9 Oct 2019 21:10:09 +0100
Subject: [PATCH 05/17] chore: exit with same exit code as nightwatch

---
 examples/browser-add-readable-stream/test.js |  2 +-
 examples/test.js                             | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/examples/browser-add-readable-stream/test.js b/examples/browser-add-readable-stream/test.js
index 3c33a61135..6d4a9879ec 100644
--- a/examples/browser-add-readable-stream/test.js
+++ b/examples/browser-add-readable-stream/test.js
@@ -4,7 +4,7 @@ module.exports = {
   'Add readable stream example': function (browser) {
     browser
       .url(process.env.IPFS_EXAMPLE_TEST_URL)
-      .waitForElementVisible('#output')
+      .waitForElementVisible('#outputs')
       .assert.containsText('#output', 'directory/ QmVgJePRxp1vhRxDcJWdmuFGfUB5S5RYTtG1NR3bQM4BBn')
       .end()
   }
diff --git a/examples/test.js b/examples/test.js
index 506e30a6f0..ec1db921e4 100644
--- a/examples/test.js
+++ b/examples/test.js
@@ -6,7 +6,9 @@ const execa = require('execa')
 const dir = path.join(__dirname, process.argv[2])
 
 testExample(dir)
-  .then(() => {}, (err) => { throw err })
+  .then(() => {}, (err) => {
+    process.exit(err.exitCode || 1)
+  })
 
 async function testExample (dir) {
   await installDeps(dir)
@@ -78,11 +80,7 @@ async function runBrowserTest (dir) {
   })
 
   try {
-    const result = await proc
-
-    if (result.stderr.includes('FAILED')) {
-      throw new Error('Tests failed')
-    }
+    await proc
   } finally {
     stopServer()
   }

From 57a57c55876ccef05240854161373684f114f463 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Wed, 9 Oct 2019 21:25:22 +0100
Subject: [PATCH 06/17] chore: fix element id

---
 examples/browser-add-readable-stream/test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/browser-add-readable-stream/test.js b/examples/browser-add-readable-stream/test.js
index 6d4a9879ec..3c33a61135 100644
--- a/examples/browser-add-readable-stream/test.js
+++ b/examples/browser-add-readable-stream/test.js
@@ -4,7 +4,7 @@ module.exports = {
   'Add readable stream example': function (browser) {
     browser
       .url(process.env.IPFS_EXAMPLE_TEST_URL)
-      .waitForElementVisible('#outputs')
+      .waitForElementVisible('#output')
       .assert.containsText('#output', 'directory/ QmVgJePRxp1vhRxDcJWdmuFGfUB5S5RYTtG1NR3bQM4BBn')
       .end()
   }

From c3d35edbba916ba4693ec275c906e1bc6aa56061 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Wed, 9 Oct 2019 21:40:28 +0100
Subject: [PATCH 07/17] test: add assertion

---
 examples/browser-script-tag/test.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/browser-script-tag/test.js b/examples/browser-script-tag/test.js
index 8ea632085d..6c5f05ab51 100644
--- a/examples/browser-script-tag/test.js
+++ b/examples/browser-script-tag/test.js
@@ -21,6 +21,8 @@ module.exports = {
         }
       })
 
+    browser.expect.element('#status').text.to.contain('Node status: online').before(30000)
+
     browser.end()
   }
 }

From b77df1ddafe1f0ef94b9876d9fe8d97a740d0bbe Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Wed, 9 Oct 2019 21:41:17 +0100
Subject: [PATCH 08/17] chore: add video streaming test

---
 .travis.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 6a6c2b250e..5084cded6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -189,6 +189,14 @@ jobs:
         - npm install
         - npm run test -- browser-script-tag
 
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: example - browser-video-streaming
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- browser-video-streaming
+
     - stage: test
       if: branch =~ /^release\/.*$/
       name: example - browser-vue

From 692634fd765a2629a7a0c2015da0e06fdad11754 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Wed, 9 Oct 2019 22:01:35 +0100
Subject: [PATCH 09/17] chore: change dist url

---
 examples/browser-add-readable-stream/index.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/examples/browser-add-readable-stream/index.html b/examples/browser-add-readable-stream/index.html
index 0a8fc03004..52488dd4dd 100644
--- a/examples/browser-add-readable-stream/index.html
+++ b/examples/browser-add-readable-stream/index.html
@@ -1,7 +1,11 @@
+<!doctype html>
 <html>
+  <head>
+    <title>Add readable stream</title>
+  </head>
   <body>
     <pre id="output"></pre>
-    <script src="../../dist/index.js"></script>
+    <script src="https://unpkg.com/ipfs/dist/index.min.js"></script>
     <script src="index.js"></script>
   </body>
 </html>

From a5b9eb33962a0a2d2760fc80eb991f45a7627403 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Wed, 9 Oct 2019 22:15:43 +0100
Subject: [PATCH 10/17] chore: build IPFS for basic browser demos

---
 examples/browser-add-readable-stream/index.html |  2 +-
 examples/browser-script-tag/index.html          |  2 +-
 examples/test.js                                | 17 ++++++++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/examples/browser-add-readable-stream/index.html b/examples/browser-add-readable-stream/index.html
index 52488dd4dd..4c3b9a7499 100644
--- a/examples/browser-add-readable-stream/index.html
+++ b/examples/browser-add-readable-stream/index.html
@@ -5,7 +5,7 @@
   </head>
   <body>
     <pre id="output"></pre>
-    <script src="https://unpkg.com/ipfs/dist/index.min.js"></script>
+    <script src="../../dist/index.js"></script>
     <script src="index.js"></script>
   </body>
 </html>
diff --git a/examples/browser-script-tag/index.html b/examples/browser-script-tag/index.html
index 3f52de9d97..b30672ea45 100644
--- a/examples/browser-script-tag/index.html
+++ b/examples/browser-script-tag/index.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <title>IPFS in the Browser</title>
-  <script src="https://unpkg.com/ipfs/dist/index.min.js"></script>
+  <script src="../../dist/index.js"></script>
   <script type="text/javascript">
     document.addEventListener('DOMContentLoaded', async () => {
       const node = await Ipfs.create({ repo: 'ipfs-' + Math.random() })
diff --git a/examples/test.js b/examples/test.js
index ec1db921e4..630e6b0f2e 100644
--- a/examples/test.js
+++ b/examples/test.js
@@ -141,13 +141,28 @@ async function startServer (dir) {
     }
   }
 
+  // running a bare index.html file
   const files = [
     path.join(dir, 'index.html')
   ]
 
   for (const f of files) {
     if (fs.existsSync(f)) {
-      console.info('Found', f)
+      console.info('Found bare file', f)
+
+      console.info('Building IPFS')
+      const proc = execa.command('npm run build', {
+        cwd: path.resolve(dir, '../../'),
+        env: {
+          ...process.env,
+          CI: true // needed for some "clever" build tools
+        }
+      })
+      proc.all.on('data', (data) => {
+        process.stdout.write(data)
+      })
+
+      await proc
 
       return Promise.resolve({
         serverUrl: `file://${f}`,

From dc0b345e67fe623883d7ca808ba0ec6890bc2546 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Thu, 10 Oct 2019 16:57:02 +0100
Subject: [PATCH 11/17] test: add some node tests

---
 .travis.yml                                  |  24 +++
 examples/README.md                           |   2 +-
 examples/browser-add-readable-stream/test.js |   6 +-
 examples/browser-browserify/test.js          |   8 +-
 examples/circuit-relaying/README.md          |   8 +-
 examples/circuit-relaying/package.json       |   1 +
 examples/circuit-relaying/src/app.js         |   3 -
 examples/circuit-relaying/test.js            | 145 +++++++++++++++++++
 examples/custom-ipfs-repo/index.js           |  10 +-
 examples/custom-ipfs-repo/package.json       |   4 +-
 examples/custom-ipfs-repo/test.js            |  22 +++
 examples/custom-libp2p/package.json          |   4 +-
 examples/custom-libp2p/test.js               |  72 +++++++++
 examples/nightwatch.conf.js                  |   9 +-
 examples/package.json                        |   3 +-
 examples/test.js                             | 113 +++------------
 examples/utils.js                            |  98 +++++++++++++
 17 files changed, 416 insertions(+), 116 deletions(-)
 create mode 100644 examples/circuit-relaying/test.js
 create mode 100644 examples/custom-ipfs-repo/test.js
 create mode 100644 examples/custom-libp2p/test.js
 create mode 100644 examples/utils.js

diff --git a/.travis.yml b/.travis.yml
index 5084cded6e..de56c709ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -213,6 +213,30 @@ jobs:
         - npm install
         - npm run test -- browser-webpack
 
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: example - circuit-relaying
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- circuit-relaying
+
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: example - custom-ipfs-repo
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- custom-ipfs-repo
+
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: example - custom-libp2p
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- custom-libp2p
+
     - stage: tag
       # only run on changes to master
       if: branch = master AND type = push AND fork = false
diff --git a/examples/README.md b/examples/README.md
index ba3af3eae2..e071d08900 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -72,4 +72,4 @@ Your `test.js` file should contain a [Nightwatch](https://www.npmjs.com/package/
 
 ### Node
 
-...
+Your `test.js` file should export an async function that sets up your test, runs any assertions, tears down anything set up and throws an error if the test fails.
diff --git a/examples/browser-add-readable-stream/test.js b/examples/browser-add-readable-stream/test.js
index 3c33a61135..1b78a2d585 100644
--- a/examples/browser-add-readable-stream/test.js
+++ b/examples/browser-add-readable-stream/test.js
@@ -5,7 +5,9 @@ module.exports = {
     browser
       .url(process.env.IPFS_EXAMPLE_TEST_URL)
       .waitForElementVisible('#output')
-      .assert.containsText('#output', 'directory/ QmVgJePRxp1vhRxDcJWdmuFGfUB5S5RYTtG1NR3bQM4BBn')
-      .end()
+
+    browser.expect.element('#outpu').text.text.to.contain('directory/ QmVgJePRxp1vhRxDcJWdmuFGfUB5S5RYTtG1NR3bQM4BBn').before(30000)
+
+    browser.end()
   }
 }
\ No newline at end of file
diff --git a/examples/browser-browserify/test.js b/examples/browser-browserify/test.js
index 363a17fa58..47dfe0e838 100644
--- a/examples/browser-browserify/test.js
+++ b/examples/browser-browserify/test.js
@@ -12,8 +12,10 @@ module.exports = {
       .pause(1000)
       .click('#store')
       .waitForElementVisible('#output')
-      .assert.containsText('#hash', 'QmWfVY9y3xjsixTgbd9AorQxH7VtMpzfx2HaWtsoUYecaX')
-      .assert.containsText('#content', 'hello')
-      .end()
+
+    browser.expect.element('#hash').text.to.contain('QmWfVY9y3xjsixTgbd9AorQxH7VtMpzfx2HaWtsoUYecaX').before(30000)
+    browser.expect.element('#content').text.to.contain('hello').before(30000)
+
+    browser.end()
   }
 }
diff --git a/examples/circuit-relaying/README.md b/examples/circuit-relaying/README.md
index 7def3ae9d2..be33d79bab 100644
--- a/examples/circuit-relaying/README.md
+++ b/examples/circuit-relaying/README.md
@@ -16,10 +16,10 @@ Here is a simple diagram depicting how a typical circuit-relay connection might
 +---------------------+         |          |         +---------------------+
 |       Node A        |---------> FIREWALL <---------|        Node B       |
 +----------^----------+         |          |         +----------^----------+
-           |                                                    |           
-           |               +---------------------+              |           
-           +--------------->   Circuit Relay     <--------------+           
-                           +---------------------+                          
+           |                                                    |
+           |               +---------------------+              |
+           +--------------->   Circuit Relay     <--------------+
+                           +---------------------+
 ```
 
 `Node A` tries to connect to `Node B` but, UH-OH! There is a firewall in between that's preventing it from happening. If both `Node A` and `Node B` know about a relay, they can use it to establish the connection.
diff --git a/examples/circuit-relaying/package.json b/examples/circuit-relaying/package.json
index 4a667afd04..6ea3f67d79 100644
--- a/examples/circuit-relaying/package.json
+++ b/examples/circuit-relaying/package.json
@@ -19,6 +19,7 @@
   },
   "devDependencies": {
     "aegir": "^20.0.0",
+    "execa": "^2.1.0",
     "ipfs-css": "^0.13.1",
     "parcel-bundler": "^1.6.2",
     "tachyons": "^4.9.1"
diff --git a/examples/circuit-relaying/src/app.js b/examples/circuit-relaying/src/app.js
index dd34347c1c..32bb634206 100644
--- a/examples/circuit-relaying/src/app.js
+++ b/examples/circuit-relaying/src/app.js
@@ -36,9 +36,6 @@ document.addEventListener('DOMContentLoaded', async () => {
         enabled: true // make this node a relay (HOP)
       }
     },
-    pubsub: {
-      enabled: true
-    },
     config: {
       Bootstrap: []
     }
diff --git a/examples/circuit-relaying/test.js b/examples/circuit-relaying/test.js
new file mode 100644
index 0000000000..425238ffa9
--- /dev/null
+++ b/examples/circuit-relaying/test.js
@@ -0,0 +1,145 @@
+'use strict'
+
+const fs = require('fs-extra')
+const os = require('os')
+const path = require('path')
+const execa = require('execa')
+const delay = require('delay')
+const DaemonFactory = require('ipfsd-ctl')
+const df = DaemonFactory.create({
+  IpfsClient: require('ipfs-http-client')
+})
+const {
+  startServer
+} = require('../utils')
+const pkg = require('./package.json')
+
+async function testUI (url, relay, localPeerIdFile, remotePeerIdFile) {
+  const proc = execa('nightwatch', [ path.join(__dirname, 'test.js') ], {
+    cwd: path.resolve(__dirname, '../'),
+    env: {
+      ...process.env,
+      CI: true,
+      IPFS_EXAMPLE_TEST_URL: url,
+      IPFS_RELAY_ADDRESS: relay,
+      IPFS_LOCAL_PEER_ID_FILE: localPeerIdFile,
+      IPFS_REMOTE_PEER_ID_FILE: remotePeerIdFile
+    }
+  })
+  proc.all.on('data', (data) => {
+    process.stdout.write(data)
+  })
+
+  await proc
+}
+
+async function runTest () {
+  const ipfsd = await df.spawn({
+    type: 'js',
+    exec: path.resolve(`${__dirname}/../../src/cli/bin.js`),
+    initOptions: { bits: 512 },
+    config: {
+      Addresses: {
+        Swarm: [
+          `/ip4/127.0.0.1/tcp/0/ws`
+        ]
+      },
+      Bootstrap: [],
+      relay: {
+        enabled: true,
+        hop: {
+          enabled: true
+        }
+      }
+    }
+  })
+  const server1 = await startServer(__dirname)
+  const server2 = await startServer(__dirname)
+
+  try {
+    const id = await ipfsd.api.id()
+    const address = id.addresses.filter(addr => addr.includes('/ws/ipfs/Qm')).pop()
+
+    if (!address) {
+      throw new Error(`Could not find web socket address in ${id.addresses}`)
+    }
+
+    const peerA = path.join(os.tmpdir(), `test-${Date.now()}-a.txt`)
+    const peerB = path.join(os.tmpdir(), `test-${Date.now()}-b.txt`)
+
+    await Promise.all([
+      testUI(server1.url, id.addresses[0], peerA, peerB),
+      testUI(server2.url, id.addresses[0], peerB, peerA)
+    ])
+  } finally {
+    await ipfsd.stop()
+    await server1.stop()
+    await server2.stop()
+  }
+}
+
+module.exports = runTest
+
+module.exports[pkg.name] = function (browser) {
+  let localPeerId = null
+  let remotePeerId = null
+
+  browser
+    .url(process.env.IPFS_EXAMPLE_TEST_URL)
+    .waitForElementVisible('#peer')
+    .clearValue('#peer')
+    .setValue('#peer', process.env.IPFS_RELAY_ADDRESS)
+    .pause(1000)
+    .click('#connect')
+
+  browser.expect.element('#peers-addrs').text.to.contain(process.env.IPFS_RELAY_ADDRESS).before(30000)
+
+  // exchange peer info
+  browser.getText('#addrs', (result) => {
+    localPeerId = result.value.trim()
+    console.info('got local peer id', localPeerId)
+  })
+    .perform(async (browser, done) => {
+      console.info('writing local peer id')
+      await fs.writeFile(process.env.IPFS_LOCAL_PEER_ID_FILE, localPeerId)
+
+      console.info('reading remote peer id')
+      for (let i = 0; i < 100; i++) {
+        try {
+          remotePeerId = await fs.readFile(process.env.IPFS_REMOTE_PEER_ID_FILE, {
+            encoding: 'utf8'
+          })
+
+          console.info('got remote peer id', remotePeerId)
+          done()
+
+          break
+        } catch (err) {
+
+        }
+
+        await delay(1000)
+      }
+
+      console.info('connecting to remote peer', remotePeerId)
+
+      browser
+        .clearValue('#peer')
+        .setValue('#peer', remotePeerId)
+        .pause(1000)
+        .click('#connect')
+
+      browser.expect.element('#peers-addrs').text.to.contain(remotePeerId).before(30000)
+
+      browser
+        .clearValue('#message')
+        .setValue('#message', 'hello')
+        .pause(1000)
+        .click('#send')
+
+      browser.expect.element('#msgs').text.to.contain(`${remotePeerId.substr(-4)}: hello`).before(30000)
+      browser.expect.element('#msgs').text.to.contain(`${localPeerId.substr(-4)}: hello`).before(30000)
+    })
+
+  browser.end()
+}
diff --git a/examples/custom-ipfs-repo/index.js b/examples/custom-ipfs-repo/index.js
index ebb1c576c6..71b6669e8e 100644
--- a/examples/custom-ipfs-repo/index.js
+++ b/examples/custom-ipfs-repo/index.js
@@ -1,5 +1,7 @@
 'use strict'
 
+const log = require('why-is-node-running')
+
 const IPFS = require('ipfs')
 const Repo = require('ipfs-repo')
 const fsLock = require('ipfs-repo/src/lock')
@@ -64,7 +66,13 @@ const customRepositoryOptions = {
 async function main () {
   // Initialize our IPFS node with the custom repo options
   const node = await IPFS.create({
-    repo: new Repo('/tmp/custom-repo/.ipfs', customRepositoryOptions)
+    repo: new Repo('/tmp/custom-repo/.ipfs', customRepositoryOptions),
+
+    // This just means we dont try to connect to the network which isn't necessary
+    // to demonstrate custom repos
+    config: {
+      Bootstrap: []
+    }
   })
 
   // Test the new repo by adding and fetching some data
diff --git a/examples/custom-ipfs-repo/package.json b/examples/custom-ipfs-repo/package.json
index f992ca99a9..9e88e6e34a 100644
--- a/examples/custom-ipfs-repo/package.json
+++ b/examples/custom-ipfs-repo/package.json
@@ -9,8 +9,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "datastore-fs": "~0.8.0",
+    "datastore-fs": "^0.9.1",
     "ipfs": "file:../../",
-    "ipfs-repo": "~0.26.1"
+    "ipfs-repo": "^0.28.0"
   }
 }
diff --git a/examples/custom-ipfs-repo/test.js b/examples/custom-ipfs-repo/test.js
new file mode 100644
index 0000000000..6c5da35a6b
--- /dev/null
+++ b/examples/custom-ipfs-repo/test.js
@@ -0,0 +1,22 @@
+'use strict'
+
+const path = require('path')
+const execa = require('execa')
+const fs = require('fs')
+
+async function test () {
+  const proc = execa('node', [ path.join(__dirname, 'index.js') ], {
+    cwd: path.resolve(__dirname)
+  })
+  proc.all.on('data', (data) => {
+    process.stdout.write(data)
+  })
+
+  await proc
+
+  if (!fs.existsSync('/tmp/custom-repo/.ipfs')) {
+    throw new Error('Custom repo was not created at /tmp/custom-repo/.ipfs')
+  }
+}
+
+module.exports = test
diff --git a/examples/custom-libp2p/package.json b/examples/custom-libp2p/package.json
index 944b8a2b7f..904579511e 100644
--- a/examples/custom-libp2p/package.json
+++ b/examples/custom-libp2p/package.json
@@ -10,9 +10,9 @@
   "license": "MIT",
   "dependencies": {
     "ipfs": "file:../../",
-    "libp2p": "~0.26.1",
+    "libp2p": "^0.26.2",
     "libp2p-bootstrap": "~0.9.7",
-    "libp2p-kad-dht": "~0.15.0",
+    "libp2p-kad-dht": "~0.16.0",
     "libp2p-mdns": "~0.12.2",
     "libp2p-secio": "~0.11.1",
     "libp2p-spdy": "~0.13.3",
diff --git a/examples/custom-libp2p/test.js b/examples/custom-libp2p/test.js
new file mode 100644
index 0000000000..d6bbb14db1
--- /dev/null
+++ b/examples/custom-libp2p/test.js
@@ -0,0 +1,72 @@
+'use strict'
+
+const path = require('path')
+const execa = require('execa')
+const Libp2p = require('libp2p')
+const TCP = require('libp2p-tcp')
+const SPDY = require('libp2p-spdy')
+const MPLEX = require('pull-mplex')
+const SECIO = require('libp2p-secio')
+const PeerInfo = require('peer-info')
+const PeerId = require('peer-id')
+const multiaddr = require('multiaddr')
+const promisify = require('promisify-es6')
+const PeerBook = require('peer-book')
+
+async function test () {
+  let output = ''
+
+  const proc = execa('node', [ path.join(__dirname, 'index.js') ], {
+    cwd: path.resolve(__dirname)
+  })
+  proc.all.on('data', async (data) => {
+    process.stdout.write(data)
+
+    output += data.toString('utf8')
+
+    if (output.includes('The node now has')) {
+      // the node has started up, try to dial it
+      const address = output.trim().match(/Swarm listening on (.*)\n/)[1]
+
+      console.info('Dialling', address)
+
+      const peerInfo = new PeerInfo(await promisify(PeerId.create)())
+      peerInfo.multiaddrs.add(multiaddr('/ip4/127.0.0.1/tcp/0'))
+
+      const libp2p = new Libp2p({
+        peerInfo,
+        peerBook: new PeerBook(),
+        modules: {
+          transport: [
+            TCP
+          ],
+          streamMuxer: [
+            MPLEX,
+            SPDY
+          ],
+          connEncryption: [
+            SECIO
+          ]
+        }
+      })
+      await libp2p.start()
+      await libp2p.dial(address)
+
+      console.info('Dialled', address)
+
+      proc.kill()
+
+      await libp2p.stop()
+    }
+  })
+
+  await proc.catch(() => {
+    // throw new Error('libp2p should have been killed')
+  }, (err) => {
+    if (err.exitSignal !== 'SIGTERM') {
+      throw err
+    }
+  })
+}
+
+module.exports = test
diff --git a/examples/nightwatch.conf.js b/examples/nightwatch.conf.js
index 4420adf897..573a1d9fab 100644
--- a/examples/nightwatch.conf.js
+++ b/examples/nightwatch.conf.js
@@ -1,5 +1,9 @@
 'use strict'
 
+const { ephemeralPort } = require('./utils')
+
+const WEBRIVER_PORT = ephemeralPort()
+
 // config used to test examples
 module.exports = {
   src_folders: ['tests'],
@@ -7,7 +11,10 @@ module.exports = {
   webdriver: {
     start_process: true,
     server_path: 'node_modules/.bin/chromedriver',
-    port: 9515
+    port: WEBRIVER_PORT,
+    cli_args: [
+      `--port=${WEBRIVER_PORT}`
+    ]
   },
 
   test_settings: {
diff --git a/examples/package.json b/examples/package.json
index b8c5639cf7..6864f438bb 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -11,6 +11,7 @@
     "execa": "^2.1.0",
     "fs-extra": "^8.1.0",
     "http-server": "~0.11.1",
-    "nightwatch": "^1.2.4"
+    "nightwatch": "^1.2.4",
+    "why-is-node-running": "^2.1.0"
   }
 }
diff --git a/examples/test.js b/examples/test.js
index 630e6b0f2e..931fa1b208 100644
--- a/examples/test.js
+++ b/examples/test.js
@@ -1,13 +1,22 @@
 'use strict'
 
+process.env.NODE_ENV = 'test'
+process.env.CI = true // needed for some "clever" build tools
+
 const fs = require('fs-extra')
 const path = require('path')
 const execa = require('execa')
 const dir = path.join(__dirname, process.argv[2])
+const { startServer } = require('./utils')
 
 testExample(dir)
   .then(() => {}, (err) => {
-    process.exit(err.exitCode || 1)
+    if (err.exitCode) {
+      process.exit(err.exitCode)
+    }
+
+    console.error(err)
+    process.exit(1)
   })
 
 async function testExample (dir) {
@@ -44,11 +53,7 @@ async function build (dir) {
   }
 
   const proc = execa.command('npm run build', {
-    cwd: dir,
-    env: {
-      ...process.env,
-      CI: true // needed for some "clever" build tools
-    }
+    cwd: dir
   })
   proc.all.on('data', (data) => {
     process.stdout.write(data)
@@ -60,19 +65,15 @@ async function build (dir) {
 async function runBrowserTest (dir) {
   console.info('Running browser tests in', dir)
 
-  const {
-    stopServer,
-    serverUrl
-  } = await startServer(dir)
+  const server = await startServer(dir)
 
-  console.info('Running tests at', serverUrl)
+  console.info('Running tests at', server.url)
 
   const proc = execa('nightwatch', [ path.join(dir, 'test.js') ], {
     cwd: __dirname,
     env: {
       ...process.env,
-      CI: true,
-      IPFS_EXAMPLE_TEST_URL: serverUrl
+      IPFS_EXAMPLE_TEST_URL: server.url
     }
   })
   proc.all.on('data', (data) => {
@@ -82,94 +83,14 @@ async function runBrowserTest (dir) {
   try {
     await proc
   } finally {
-    stopServer()
+    server.stop()
   }
 }
 
 async function runNodeTest (dir) {
   console.info('Running node tests in', dir)
-}
 
-async function startServer (dir) {
-  async function serveFrom (path) {
-    return new Promise((resolve, reject) => {
-      let output = ''
-
-      const proc = execa.command(`http-server ${path} -a 127.0.0.1`, {
-        cwd: __dirname
-      })
-      proc.all.on('data', (data) => {
-        process.stdout.write(data)
-
-        const line = data.toString('utf8')
-        output += line
-
-        if (output.includes('Hit CTRL-C to stop the server')) {
-          // find the port
-          const port = output.match(/http:\/\/127.0.0.1:(\d+)/)[1]
-
-          if (!port) {
-            throw new Error(`Could not find port in ${output}`)
-          }
-
-          resolve({
-            stopServer: () => {
-              console.info('Stopping server')
-              proc.kill('SIGINT', {
-                forceKillAfterTimeout: 2000
-              })
-            },
-            serverUrl: `http://127.0.0.1:${port}`
-          })
-        }
-      })
-
-      proc.then(() => {}, (err) => reject(err))
-    })
-  }
-
-  // start something..
-  const serverPaths = [
-    path.join(dir, 'build'),
-    path.join(dir, 'dist'),
-    path.join(dir, 'public')
-  ]
-
-  for (const p of serverPaths) {
-    if (fs.existsSync(p)) {
-      return serveFrom(p)
-    }
-  }
-
-  // running a bare index.html file
-  const files = [
-    path.join(dir, 'index.html')
-  ]
-
-  for (const f of files) {
-    if (fs.existsSync(f)) {
-      console.info('Found bare file', f)
-
-      console.info('Building IPFS')
-      const proc = execa.command('npm run build', {
-        cwd: path.resolve(dir, '../../'),
-        env: {
-          ...process.env,
-          CI: true // needed for some "clever" build tools
-        }
-      })
-      proc.all.on('data', (data) => {
-        process.stdout.write(data)
-      })
-
-      await proc
-
-      return Promise.resolve({
-        serverUrl: `file://${f}`,
-        stopServer: () => {}
-      })
-    }
-  }
+  const runTest = require(path.join(dir, 'test.js'))
 
-  throw new Error('Browser examples must contain a `public`, `dist` or `build` folder or an `index.html` file')
+  await runTest()
 }
diff --git a/examples/utils.js b/examples/utils.js
new file mode 100644
index 0000000000..34e8f1240f
--- /dev/null
+++ b/examples/utils.js
@@ -0,0 +1,98 @@
+'use strict'
+
+const fs = require('fs-extra')
+const path = require('path')
+const execa = require('execa')
+
+async function startServer (dir) {
+  async function serveFrom (path) {
+    return new Promise((resolve, reject) => {
+      let output = ''
+
+      const proc = execa.command(`http-server ${path} -a 127.0.0.1`, {
+        cwd: __dirname
+      })
+      proc.all.on('data', (data) => {
+        process.stdout.write(data)
+
+        const line = data.toString('utf8')
+        output += line
+
+        if (output.includes('Hit CTRL-C to stop the server')) {
+          // find the port
+          const port = output.match(/http:\/\/127.0.0.1:(\d+)/)[1]
+
+          if (!port) {
+            throw new Error(`Could not find port in ${output}`)
+          }
+
+          resolve({
+            stop: () => {
+              console.info('Stopping server')
+              proc.kill('SIGINT', {
+                forceKillAfterTimeout: 2000
+              })
+            },
+            url: `http://127.0.0.1:${port}`
+          })
+        }
+      })
+
+      proc.then(() => {}, (err) => reject(err))
+    })
+  }
+
+  // start something..
+  const serverPaths = [
+    path.join(dir, 'build'),
+    path.join(dir, 'dist'),
+    path.join(dir, 'public')
+  ]
+
+  for (const p of serverPaths) {
+    if (fs.existsSync(p)) {
+      return serveFrom(p)
+    }
+  }
+
+  // running a bare index.html file
+  const files = [
+    path.join(dir, 'index.html')
+  ]
+
+  for (const f of files) {
+    if (fs.existsSync(f)) {
+      console.info('Found bare file', f)
+
+      console.info('Building IPFS')
+      const proc = execa.command('npm run build', {
+        cwd: path.resolve(dir, '../../'),
+        env: {
+          ...process.env,
+          CI: true // needed for some "clever" build tools
+        }
+      })
+      proc.all.on('data', (data) => {
+        process.stdout.write(data)
+      })
+
+      await proc
+
+      return Promise.resolve({
+        url: `file://${f}`,
+        stop: () => {}
+      })
+    }
+  }
+
+  throw new Error('Browser examples must contain a `public`, `dist` or `build` folder or an `index.html` file')
+}
+
+function ephemeralPort (min = 49152, max = 65535) {
+  return Math.floor(Math.random() * (max - min + 1) + min)
+}
+
+module.exports = {
+  startServer,
+  ephemeralPort
+}

From 3bfe35299b40b5355a0613176b8c44f1c4b412a3 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Thu, 10 Oct 2019 18:31:03 +0100
Subject: [PATCH 12/17] test: adds some more tests. ethereum one is a little
 wobbly

---
 .travis.yml                                   |  16 +++
 examples/circuit-relaying/test.js             |   4 +-
 examples/exchange-files-in-browser/README.md  |   2 +-
 .../exchange-files-in-browser/package.json    |   7 +-
 examples/exchange-files-in-browser/test.js    | 114 ++++++++++++++++++
 examples/explore-ethereum-blockchain/test.js  |  50 ++++++++
 6 files changed, 188 insertions(+), 5 deletions(-)
 create mode 100644 examples/exchange-files-in-browser/test.js
 create mode 100644 examples/explore-ethereum-blockchain/test.js

diff --git a/.travis.yml b/.travis.yml
index de56c709ba..839cb59823 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -237,6 +237,22 @@ jobs:
         - npm install
         - npm run test -- custom-libp2p
 
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: example - exchange-files-in-browser
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- exchange-files-in-browser
+
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: example - explore-ethereum-blockchain
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- explore-ethereum-blockchain
+
     - stage: tag
       # only run on changes to master
       if: branch = master AND type = push AND fork = false
diff --git a/examples/circuit-relaying/test.js b/examples/circuit-relaying/test.js
index 425238ffa9..d66b48ee9e 100644
--- a/examples/circuit-relaying/test.js
+++ b/examples/circuit-relaying/test.js
@@ -7,6 +7,8 @@ const execa = require('execa')
 const delay = require('delay')
 const DaemonFactory = require('ipfsd-ctl')
 const df = DaemonFactory.create({
+  type: 'js',
+  exec: path.resolve(`${__dirname}/../../src/cli/bin.js`),
   IpfsClient: require('ipfs-http-client')
 })
 const {
@@ -35,8 +37,6 @@ async function testUI (url, relay, localPeerIdFile, remotePeerIdFile) {
 
 async function runTest () {
   const ipfsd = await df.spawn({
-    type: 'js',
-    exec: path.resolve(`${__dirname}/../../src/cli/bin.js`),
     initOptions: { bits: 512 },
     config: {
       Addresses: {
diff --git a/examples/exchange-files-in-browser/README.md b/examples/exchange-files-in-browser/README.md
index adb86df2fb..dd65da1cf1 100644
--- a/examples/exchange-files-in-browser/README.md
+++ b/examples/exchange-files-in-browser/README.md
@@ -130,7 +130,7 @@ We'll need to install and bundle the dependencies to run the app. Let's do it:
 ```sh
 > npm install
 ...
-> npm run bundle
+> npm run build
 ...
 > npm start
 ```
diff --git a/examples/exchange-files-in-browser/package.json b/examples/exchange-files-in-browser/package.json
index a12b50f5be..8193cc7123 100644
--- a/examples/exchange-files-in-browser/package.json
+++ b/examples/exchange-files-in-browser/package.json
@@ -2,9 +2,9 @@
   "name": "exchange-files-browser",
   "version": "0.0.0",
   "scripts": {
-    "bundle": "browserify public/app.js > public/bundle.js",
+    "build": "browserify public/app.js > public/bundle.js",
     "start": "http-server -c-1 -p 12345 public",
-    "dev": "npm run bundle && npm run start"
+    "dev": "npm run build && npm run start"
   },
   "license": "MIT",
   "devDependencies": {
@@ -13,5 +13,8 @@
   },
   "dependencies": {
     "ipfs": "file:../../"
+  },
+  "browser": {
+    "ipfs": "ipfs/dist"
   }
 }
diff --git a/examples/exchange-files-in-browser/test.js b/examples/exchange-files-in-browser/test.js
new file mode 100644
index 0000000000..82a6557fa5
--- /dev/null
+++ b/examples/exchange-files-in-browser/test.js
@@ -0,0 +1,114 @@
+'use strict'
+
+const path = require('path')
+const execa = require('execa')
+const DaemonFactory = require('ipfsd-ctl')
+const df = DaemonFactory.create({
+  type: 'js',
+  exec: path.resolve(`${__dirname}/../../src/cli/bin.js`),
+  IpfsClient: require('ipfs-http-client')
+})
+const {
+  startServer
+} = require('../utils')
+const pkg = require('./package.json')
+
+async function testUI (url, relay, cid, workspaceName, addFile) {
+  const proc = execa('nightwatch', [ path.join(__dirname, 'test.js') ], {
+    cwd: path.resolve(__dirname, '../'),
+    env: {
+      ...process.env,
+      CI: true,
+      IPFS_EXAMPLE_TEST_URL: url,
+      IPFS_RELAY_ADDRESS: relay,
+      IPFS_CID: cid,
+      IPFS_WORKSPACE_NAME: workspaceName,
+      IPFS_ADD_FILE: addFile
+    }
+  })
+  proc.all.on('data', (data) => {
+    process.stdout.write(data)
+  })
+
+  await proc
+}
+
+async function runTest () {
+  const ipfsd = await df.spawn({
+    initOptions: { bits: 512 },
+    config: {
+      Addresses: {
+        Swarm: [
+          `/ip4/127.0.0.1/tcp/0/ws`
+        ]
+      },
+      Bootstrap: []
+    }
+  })
+
+  const [{
+    hash: cid
+  }] = await ipfsd.api.add('A file with some content')
+  const server1 = await startServer(__dirname)
+  const server2 = await startServer(__dirname)
+
+  try {
+    const id = await ipfsd.api.id()
+    const address = id.addresses.filter(addr => addr.includes('/ws/ipfs/Qm')).pop()
+
+    if (!address) {
+      throw new Error(`Could not find web socket address in ${id.addresses}`)
+    }
+
+    let workspaceName = `test-${Date.now()}`
+
+    await Promise.all([
+      testUI(server1.url, id.addresses[0], cid, workspaceName, true),
+      testUI(server2.url, id.addresses[0], cid, workspaceName)
+    ])
+  } finally {
+    await ipfsd.stop()
+    await server1.stop()
+    await server2.stop()
+  }
+}
+
+module.exports = runTest
+
+module.exports[pkg.name] = function (browser) {
+  browser
+    .url(process.env.IPFS_EXAMPLE_TEST_URL)
+    .waitForElementVisible('.node-addresses li pre')
+    .pause(1000)
+    .clearValue('#multiaddr-input')
+    .setValue('#multiaddr-input', process.env.IPFS_RELAY_ADDRESS)
+    .pause(1000)
+    .click('#peer-btn')
+
+  browser.expect.element('#peers').text.to.contain(process.env.IPFS_RELAY_ADDRESS).before(30000)
+
+  browser
+    .clearValue('#workspace-input')
+    .setValue('#workspace-input', process.env.IPFS_WORKSPACE_NAME)
+    .pause(1000)
+    .click('#workspace-btn')
+
+  browser.expect.element('#logs').text.to.contain(`Subscribed to workspace #${process.env.IPFS_WORKSPACE_NAME}`).before(30000)
+
+  // only one browser should add the file to the workspace
+  if (process.env.IPFS_ADD_FILE) {
+    // add the file from the server
+    browser
+      .clearValue('#cid-input')
+      .setValue('#cid-input', process.env.IPFS_CID)
+      .pause(1000)
+      .click('#fetch-btn')
+
+    browser.expect.element('#logs').text.to.contain(`The ${process.env.IPFS_CID} file was added.`).before(30000)
+  }
+
+  // but should both see the added file
+  browser.expect.element('#file-history').text.to.contain(process.env.IPFS_CID).before(30000)
+
+  browser.end()
+}
diff --git a/examples/explore-ethereum-blockchain/test.js b/examples/explore-ethereum-blockchain/test.js
new file mode 100644
index 0000000000..46556250dd
--- /dev/null
+++ b/examples/explore-ethereum-blockchain/test.js
@@ -0,0 +1,50 @@
+'use strict'
+
+const fs = require('fs-extra')
+const path = require('path')
+const DaemonFactory = require('ipfsd-ctl')
+const df = DaemonFactory.create({
+  type: 'proc',
+  exec: require('../../')
+})
+
+async function runTest () {
+  const ipfsd = await df.spawn({
+    initOptions: { bits: 512 },
+    config: {
+      Addresses: {
+        Swarm: []
+      },
+      Bootstrap: []
+    },
+    disposable: true
+  })
+
+  let cids = []
+
+  console.info('Importing eth-blocks')
+  for (const file of await fs.readdir(path.join(__dirname, 'eth-stuffs'))) {
+    const ethBlock = await fs.readFile(path.join(__dirname, 'eth-stuffs', file))
+    const block = await ipfsd.api.block.put(ethBlock, {
+      format: 'eth-block',
+      mhtype: 'keccak-256'
+    })
+
+    cids.push(block.cid)
+  }
+
+  console.info('Reading eth-blocks back out')
+  for (const cid of cids) {
+    try {
+      await ipfsd.api.dag.get(cid)
+      console.error('block was ok', cid.toString())
+    } catch (err) {
+      console.error('block was invalid', cid.toString())
+      console.error(err)
+    }
+  }
+
+  await ipfsd.stop()
+}
+
+module.exports = runTest

From 272db4759068901d96b5f964e4fd0838c5df5c43 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Thu, 10 Oct 2019 18:35:39 +0100
Subject: [PATCH 13/17] chore: accept bundle as build script

---
 examples/README.md                              |  2 +-
 examples/browser-browserify/package.json        |  4 ++--
 examples/exchange-files-in-browser/README.md    |  2 +-
 examples/exchange-files-in-browser/package.json |  4 ++--
 examples/test.js                                | 13 +++++++++++--
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/examples/README.md b/examples/README.md
index e071d08900..53afb94431 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -60,7 +60,7 @@ All browser examples should either be a whole webapp or a simple demo.
 
 #### Webapp
 
-Webapps must have a `package.json` that contains a `build` script.  This script should place all assets in a folder named `dist` including an `index.html` file.  During testing this will have a web server run over it using `http-server`.
+Webapps must have a `package.json` that contains either a `build` or a `bundle` script.  This script should place all assets in a folder named `dist`, `build` or `public` including an `index.html` file.  During testing this will have a web server run over it using `http-server`.
 
 #### Simple demo
 
diff --git a/examples/browser-browserify/package.json b/examples/browser-browserify/package.json
index cd72814280..047d4c4fb4 100644
--- a/examples/browser-browserify/package.json
+++ b/examples/browser-browserify/package.json
@@ -4,9 +4,9 @@
   "description": "Bundle js-ipfs with Browserify",
   "main": "index.js",
   "scripts": {
-    "build": "browserify src/index.js > public/bundle.js",
+    "bundle": "browserify src/index.js > public/bundle.js",
     "serve": "http-server public -a 127.0.0.1 -p 8888",
-    "start": "npm run build && npm run serve"
+    "start": "npm run bundle && npm run serve"
   },
   "keywords": [],
   "license": "MIT",
diff --git a/examples/exchange-files-in-browser/README.md b/examples/exchange-files-in-browser/README.md
index dd65da1cf1..adb86df2fb 100644
--- a/examples/exchange-files-in-browser/README.md
+++ b/examples/exchange-files-in-browser/README.md
@@ -130,7 +130,7 @@ We'll need to install and bundle the dependencies to run the app. Let's do it:
 ```sh
 > npm install
 ...
-> npm run build
+> npm run bundle
 ...
 > npm start
 ```
diff --git a/examples/exchange-files-in-browser/package.json b/examples/exchange-files-in-browser/package.json
index 8193cc7123..f2421f8793 100644
--- a/examples/exchange-files-in-browser/package.json
+++ b/examples/exchange-files-in-browser/package.json
@@ -2,9 +2,9 @@
   "name": "exchange-files-browser",
   "version": "0.0.0",
   "scripts": {
-    "build": "browserify public/app.js > public/bundle.js",
+    "bundle": "browserify public/app.js > public/bundle.js",
     "start": "http-server -c-1 -p 12345 public",
-    "dev": "npm run build && npm run start"
+    "dev": "npm run bundle && npm run start"
   },
   "license": "MIT",
   "devDependencies": {
diff --git a/examples/test.js b/examples/test.js
index 931fa1b208..308e618a36 100644
--- a/examples/test.js
+++ b/examples/test.js
@@ -47,12 +47,21 @@ async function installDeps (dir) {
 }
 
 async function build (dir) {
-  if (!fs.existsSync(path.join(dir, 'package.json'))) {
+  const pkgJson = path.join(dir, 'package.json')
+
+  if (!fs.existsSync(pkgJson)) {
     console.info('Nothing to build in', dir)
     return
   }
 
-  const proc = execa.command('npm run build', {
+  const pkg = require(pkgJson)
+  let build = 'build'
+
+  if (pkg.scripts.bundle) {
+    build = 'bundle'
+  }
+
+  const proc = execa('npm', ['run', build], {
     cwd: dir
   })
   proc.all.on('data', (data) => {

From 9217429b9cb0776b828df538da470a3d549709ec Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Fri, 11 Oct 2019 08:29:03 +0100
Subject: [PATCH 14/17] test: add final few tests

---
 .travis.yml                                  | 24 ++++++
 examples/browser-add-readable-stream/test.js |  2 +-
 examples/ipfs-101/test.js                    | 12 +++
 examples/package.json                        |  1 +
 examples/run-in-electron/test.js             | 13 ++++
 examples/running-multiple-nodes/test.js      | 79 +++++++++++++++++++
 examples/test-all.js                         | 33 ++++++++
 examples/test.js                             | 16 +++-
 examples/traverse-ipld-graphs/README.md      |  2 +-
 examples/traverse-ipld-graphs/test.js        | 33 ++++++++
 examples/utils.js                            | 82 ++++++++++++++++----
 11 files changed, 281 insertions(+), 16 deletions(-)
 create mode 100644 examples/ipfs-101/test.js
 create mode 100644 examples/run-in-electron/test.js
 create mode 100644 examples/running-multiple-nodes/test.js
 create mode 100644 examples/test-all.js
 create mode 100644 examples/traverse-ipld-graphs/test.js

diff --git a/.travis.yml b/.travis.yml
index 839cb59823..e37d79cef1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -253,6 +253,30 @@ jobs:
         - npm install
         - npm run test -- explore-ethereum-blockchain
 
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: example - ipfs-101
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- ipfs-101
+
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: example - running-multiple-nodes
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- running-multiple-nodes
+
+    - stage: test
+      if: branch =~ /^release\/.*$/
+      name: example - traverse-ipld-graphs
+      script:
+        - cd examples
+        - npm install
+        - npm run test -- traverse-ipld-graphs
+
     - stage: tag
       # only run on changes to master
       if: branch = master AND type = push AND fork = false
diff --git a/examples/browser-add-readable-stream/test.js b/examples/browser-add-readable-stream/test.js
index 1b78a2d585..c88bc5a415 100644
--- a/examples/browser-add-readable-stream/test.js
+++ b/examples/browser-add-readable-stream/test.js
@@ -6,7 +6,7 @@ module.exports = {
       .url(process.env.IPFS_EXAMPLE_TEST_URL)
       .waitForElementVisible('#output')
 
-    browser.expect.element('#outpu').text.text.to.contain('directory/ QmVgJePRxp1vhRxDcJWdmuFGfUB5S5RYTtG1NR3bQM4BBn').before(30000)
+    browser.expect.element('#output').text.to.contain('directory/ QmVgJePRxp1vhRxDcJWdmuFGfUB5S5RYTtG1NR3bQM4BBn').before(30000)
 
     browser.end()
   }
diff --git a/examples/ipfs-101/test.js b/examples/ipfs-101/test.js
new file mode 100644
index 0000000000..73e96d1e97
--- /dev/null
+++ b/examples/ipfs-101/test.js
@@ -0,0 +1,12 @@
+'use strict'
+
+const path = require('path')
+const {
+  waitForOutput
+} = require('../utils')
+
+async function runTest () {
+  await waitForOutput('Added file contents:', path.resolve(__dirname, '1.js'))
+}
+
+module.exports = runTest
diff --git a/examples/package.json b/examples/package.json
index 6864f438bb..eb99d19798 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -12,6 +12,7 @@
     "fs-extra": "^8.1.0",
     "http-server": "~0.11.1",
     "nightwatch": "^1.2.4",
+    "which": "^2.0.1",
     "why-is-node-running": "^2.1.0"
   }
 }
diff --git a/examples/run-in-electron/test.js b/examples/run-in-electron/test.js
new file mode 100644
index 0000000000..9ee32162a8
--- /dev/null
+++ b/examples/run-in-electron/test.js
@@ -0,0 +1,13 @@
+'use strict'
+
+const {
+  waitForOutput
+} = require('../utils')
+
+async function runTest () {
+  await waitForOutput('protocolVersion', 'npm', ['run', 'start'], {
+    cwd: __dirname
+  })
+}
+
+module.exports = runTest
diff --git a/examples/running-multiple-nodes/test.js b/examples/running-multiple-nodes/test.js
new file mode 100644
index 0000000000..b7b3e93c7d
--- /dev/null
+++ b/examples/running-multiple-nodes/test.js
@@ -0,0 +1,79 @@
+'use strict'
+
+const IPFS = require('ipfs')
+
+const execa = require('execa')
+const os = require('os')
+const path = require('path')
+const hat = require('hat')
+const {
+  ephemeralPort,
+  waitForOutput
+} = require('../utils')
+
+async function  testCli () {
+  await Promise.all([
+    startCliNode(),
+    startCliNode()
+  ])
+}
+
+async function startCliNode () {
+  const repoDir = path.join(os.tmpdir(), `repo-${hat()}`)
+  const opts = {
+    env: {
+      ...process.env,
+      IPFS_PATH: repoDir
+    }
+  }
+  const ipfs = path.resolve(__dirname, '../../src/cli/bin.js')
+
+  await execa(ipfs, ['init'], opts)
+  await execa(ipfs, ['config', 'Addresses.Swarm', '--json', JSON.stringify([`/ip4/0.0.0.0/tcp/${ephemeralPort()}`, `/ip4/127.0.0.1/tcp/${ephemeralPort()}/ws`])], opts)
+  await execa(ipfs, ['config', 'Addresses.API', `/ip4/127.0.0.1/tcp/${ephemeralPort()}`], opts)
+  await execa(ipfs, ['config', 'Addresses.Gateway', `/ip4/127.0.0.1/tcp/${ephemeralPort()}`], opts)
+
+  return waitForOutput('Daemon is ready', ipfs, ['daemon'], opts)
+}
+
+async function testProgramatically () {
+  await Promise.all([
+    startProgramaticNode(),
+    startProgramaticNode()
+  ])
+}
+
+async function startProgramaticNode () {
+  const repoDir = path.join(os.tmpdir(), `repo-${hat()}`)
+  const node = new IPFS({
+    repo: repoDir,
+    config: {
+      Addresses: {
+        Swarm: [
+          `/ip4/0.0.0.0/tcp/${ephemeralPort()}`,
+          `/ip4/127.0.0.1/tcp/${ephemeralPort()}/ws`
+        ],
+        API: `/ip4/127.0.0.1/tcp/${ephemeralPort()}`,
+        Gateway: `/ip4/127.0.0.1/tcp/${ephemeralPort()}`
+      },
+      Bootstrap: []
+    }
+  })
+
+  console.info('Initialising programmatic node')
+  await node.init()
+  console.info('Starting programmatic node')
+  await node.start()
+  console.info('Stopping programmatic node')
+  await node.stop()
+}
+
+async function runTest () {
+  console.info('Testing CLI recipe')
+  await testCli()
+  console.info('Testing Programmatic recipe')
+  await testProgramatically()
+  console.info('Done!')
+}
+
+module.exports = runTest
diff --git a/examples/test-all.js b/examples/test-all.js
new file mode 100644
index 0000000000..3ee99e45fa
--- /dev/null
+++ b/examples/test-all.js
@@ -0,0 +1,33 @@
+'use strict'
+
+process.on('unhandedRejection', (err) => {
+  console.error(err)
+
+  process.exit(1)
+})
+
+const path = require('path')
+const fs = require('fs')
+const {
+  waitForOutput
+} = require('./utils')
+
+async function testAll () {
+  for (const dir of fs.readdirSync(__dirname)) {
+    if (dir === 'node_modules' || dir === 'tests_output') {
+      continue
+    }
+
+    const stats = fs.statSync(path.join(__dirname, dir))
+
+    if (!stats.isDirectory()) {
+      continue
+    }
+
+    await waitForOutput('npm info ok', 'npm', ['test', '--', dir], {
+      cwd: __dirname
+    })
+  }
+}
+
+testAll()
diff --git a/examples/test.js b/examples/test.js
index 308e618a36..8d0a01441a 100644
--- a/examples/test.js
+++ b/examples/test.js
@@ -36,6 +36,11 @@ async function installDeps (dir) {
     return
   }
 
+  if (fs.existsSync(path.join(dir, 'node_modules'))) {
+    console.info('Dependencies already installed in', dir)
+    return
+  }
+
   const proc = execa.command('npm install', {
     cwd: dir
   })
@@ -55,12 +60,21 @@ async function build (dir) {
   }
 
   const pkg = require(pkgJson)
-  let build = 'build'
+  let build
 
   if (pkg.scripts.bundle) {
     build = 'bundle'
   }
 
+  if (pkg.scripts.build) {
+    build = 'build'
+  }
+
+  if (!build) {
+    console.info('No "build" or "bundle" script in', pkgJson)
+    return
+  }
+
   const proc = execa('npm', ['run', build], {
     cwd: dir
   })
diff --git a/examples/traverse-ipld-graphs/README.md b/examples/traverse-ipld-graphs/README.md
index a460caff2a..7a13cabfb6 100644
--- a/examples/traverse-ipld-graphs/README.md
+++ b/examples/traverse-ipld-graphs/README.md
@@ -20,7 +20,7 @@ This tutorial goes through several operations over IPLD graphs using the [DAG AP
 ## [traverse through a git repo](./git.js)
 The example objects contained in "git-objects" have already been decompressed with zlib.  An example of how to do this:
 
-    $ cat .git/objects/7d/df25817f57c2090a9568cdb17106a76dad7d04 | zlib-flate -uncompress > 7ddf25817f57c2090a9568cdb17106a76dad7d04 
+    $ cat .git/objects/7d/df25817f57c2090a9568cdb17106a76dad7d04 | zlib-flate -uncompress > 7ddf25817f57c2090a9568cdb17106a76dad7d04
 
 ## Video of the demos
 
diff --git a/examples/traverse-ipld-graphs/test.js b/examples/traverse-ipld-graphs/test.js
new file mode 100644
index 0000000000..cea342cd67
--- /dev/null
+++ b/examples/traverse-ipld-graphs/test.js
@@ -0,0 +1,33 @@
+'use strict'
+
+const path = require('path')
+const {
+  waitForOutput
+} = require('../utils')
+
+async function runTest () {
+  console.info('Testing put.js')
+  await waitForOutput('bafyreigsccjrxlioppkkzv27se4gxh2aygbxfnsobkaxxqiuni544uk66a', path.resolve(__dirname, 'put.js'))
+
+  console.info('Testing get.js')
+  await waitForOutput('{"name":"David","likes":["js-ipfs","icecream","steak"]}', path.resolve(__dirname, 'get.js'))
+
+  console.info('Testing get-path.js')
+  await waitForOutput('js-ipfs', path.resolve(__dirname, 'get-path.js'))
+
+  console.info('Testing get-path-accross-formats.js')
+  await waitForOutput('capoeira', path.resolve(__dirname, 'get-path-accross-formats.js'))
+
+  console.info('Testing tree.js')
+  await waitForOutput("'hobbies/0/Links' ]", path.resolve(__dirname, 'tree.js'))
+
+  console.info('Testing eth.js')
+  await waitForOutput('302516', path.resolve(__dirname, 'eth.js'))
+
+  console.info('Testing git.js')
+  await waitForOutput("'hello world!'", path.resolve(__dirname, 'git.js'))
+
+  console.info('Done!')
+}
+
+module.exports = runTest
diff --git a/examples/utils.js b/examples/utils.js
index 34e8f1240f..74450095d3 100644
--- a/examples/utils.js
+++ b/examples/utils.js
@@ -3,6 +3,7 @@
 const fs = require('fs-extra')
 const path = require('path')
 const execa = require('execa')
+const which = require('which')
 
 async function startServer (dir) {
   async function serveFrom (path) {
@@ -64,19 +65,21 @@ async function startServer (dir) {
     if (fs.existsSync(f)) {
       console.info('Found bare file', f)
 
-      console.info('Building IPFS')
-      const proc = execa.command('npm run build', {
-        cwd: path.resolve(dir, '../../'),
-        env: {
-          ...process.env,
-          CI: true // needed for some "clever" build tools
-        }
-      })
-      proc.all.on('data', (data) => {
-        process.stdout.write(data)
-      })
+      if (!fs.existsSync(path.resolve(dir, '../../dist'))) {
+        console.info('Building IPFS')
+        const proc = execa.command('npm run build', {
+          cwd: path.resolve(dir, '../../'),
+          env: {
+            ...process.env,
+            CI: true // needed for some "clever" build tools
+          }
+        })
+        proc.all.on('data', (data) => {
+          process.stdout.write(data)
+        })
 
-      await proc
+        await proc
+      }
 
       return Promise.resolve({
         url: `file://${f}`,
@@ -92,7 +95,60 @@ function ephemeralPort (min = 49152, max = 65535) {
   return Math.floor(Math.random() * (max - min + 1) + min)
 }
 
+async function isExecutable (command) {
+  try {
+    await fs.access(command, fs.constants.X_OK)
+
+    return true
+  } catch (err) {
+    if (err.code === 'ENOENT') {
+      return isExecutable(await which(command))
+    }
+
+    if (err.code === 'EACCES') {
+      return false
+    }
+
+    throw err
+  }
+}
+
+async function waitForOutput (expectedOutput, command, args = [], opts = {}) {
+  if (!await isExecutable(command)) {
+    args.unshift(command)
+    command = 'node'
+  }
+
+  const proc = execa(command, args, opts)
+  let output = ''
+  let time = 30000
+
+  let timeout = setTimeout(() => {
+    throw new Error(`Did not see "${expectedOutput}" in output from "${[command].concat(args).join(' ')}" after ${time/1000}s`)
+  }, time)
+
+  proc.all.on('data', (data) => {
+    process.stdout.write(data)
+
+    output += data.toString('utf8')
+
+    if (output.includes(expectedOutput)) {
+      clearTimeout(timeout)
+      proc.kill()
+    }
+  })
+
+  try {
+    await proc
+  } catch (err) {
+    if (!err.killed) {
+      throw err
+    }
+  }
+}
+
 module.exports = {
   startServer,
-  ephemeralPort
+  ephemeralPort,
+  waitForOutput
 }

From 9b8d2940fe0a458e8c36a9da40fc3c2786d02d8b Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Fri, 11 Oct 2019 09:13:01 +0100
Subject: [PATCH 15/17] test: control assertion timeouts with global

---
 examples/browser-add-readable-stream/test.js |  2 +-
 examples/browser-browserify/test.js          |  4 ++--
 examples/browser-mfs/test.js                 | 10 +++++-----
 examples/browser-parceljs/test.js            |  2 +-
 examples/browser-readablestream/test.js      |  4 ++--
 examples/browser-script-tag/test.js          |  2 +-
 examples/browser-vue/test.js                 |  2 +-
 examples/browser-webpack/test.js             |  6 +++---
 examples/circuit-relaying/test.js            |  8 ++++----
 examples/exchange-files-in-browser/test.js   |  8 ++++----
 examples/utils.js                            |  2 +-
 11 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/examples/browser-add-readable-stream/test.js b/examples/browser-add-readable-stream/test.js
index c88bc5a415..e16b977c4a 100644
--- a/examples/browser-add-readable-stream/test.js
+++ b/examples/browser-add-readable-stream/test.js
@@ -6,7 +6,7 @@ module.exports = {
       .url(process.env.IPFS_EXAMPLE_TEST_URL)
       .waitForElementVisible('#output')
 
-    browser.expect.element('#output').text.to.contain('directory/ QmVgJePRxp1vhRxDcJWdmuFGfUB5S5RYTtG1NR3bQM4BBn').before(30000)
+    browser.expect.element('#output').text.to.contain('directory/ QmVgJePRxp1vhRxDcJWdmuFGfUB5S5RYTtG1NR3bQM4BBn')
 
     browser.end()
   }
diff --git a/examples/browser-browserify/test.js b/examples/browser-browserify/test.js
index 47dfe0e838..4b729108d4 100644
--- a/examples/browser-browserify/test.js
+++ b/examples/browser-browserify/test.js
@@ -13,8 +13,8 @@ module.exports = {
       .click('#store')
       .waitForElementVisible('#output')
 
-    browser.expect.element('#hash').text.to.contain('QmWfVY9y3xjsixTgbd9AorQxH7VtMpzfx2HaWtsoUYecaX').before(30000)
-    browser.expect.element('#content').text.to.contain('hello').before(30000)
+    browser.expect.element('#hash').text.to.contain('QmWfVY9y3xjsixTgbd9AorQxH7VtMpzfx2HaWtsoUYecaX')
+    browser.expect.element('#content').text.to.contain('hello')
 
     browser.end()
   }
diff --git a/examples/browser-mfs/test.js b/examples/browser-mfs/test.js
index ca4cdf4ae0..59f88a0460 100644
--- a/examples/browser-mfs/test.js
+++ b/examples/browser-mfs/test.js
@@ -9,7 +9,7 @@ module.exports = {
       .waitForElementNotVisible('#modal-screen')
       .waitForElementVisible('#log')
 
-    browser.expect.element('#log').text.to.contain('IPFS: Drop some files into this window to get started').before(30000)
+    browser.expect.element('#log').text.to.contain('IPFS: Drop some files into this window to get started')
 
     browser.waitForElementVisible('#button-mkdir')
       .click('#button-mkdir')
@@ -18,7 +18,7 @@ module.exports = {
       .setValue('#form-mkdir-path', '/folder')
       .click('#button-form-mkdir-submit')
 
-    browser.expect.element('#files').text.to.contain('folder/').before(30000)
+    browser.expect.element('#files').text.to.contain('folder/')
 
     browser.click('#button-cp')
       .waitForElementVisible('#form-cp-path')
@@ -28,7 +28,7 @@ module.exports = {
       .setValue('#form-cp-dest', '/folder-copy')
       .click('#button-form-cp-submit')
 
-    browser.expect.element('#files').text.to.contain('folder-copy/').before(30000)
+    browser.expect.element('#files').text.to.contain('folder-copy/')
 
     browser.click('#button-mv')
       .waitForElementVisible('#form-mv-path')
@@ -38,8 +38,8 @@ module.exports = {
       .setValue('#form-mv-dest', '/folder-other')
       .click('#button-form-mv-submit')
 
-    browser.expect.element('#files').text.to.not.contain('folder/').before(30000)
-    browser.expect.element('#files').text.to.contain('folder-other/').before(30000)
+    browser.expect.element('#files').text.to.not.contain('folder/')
+    browser.expect.element('#files').text.to.contain('folder-other/')
 
     browser.end()
   }
diff --git a/examples/browser-parceljs/test.js b/examples/browser-parceljs/test.js
index 6f30ea9a8c..ad5f99558a 100644
--- a/examples/browser-parceljs/test.js
+++ b/examples/browser-parceljs/test.js
@@ -8,7 +8,7 @@ module.exports = {
       .url(process.env.IPFS_EXAMPLE_TEST_URL)
       .waitForElementVisible('#output')
 
-    browser.expect.element('#output').text.to.contain('The contents of the file was: Hello from parcel.js bundled ipfs example').before(30000)
+    browser.expect.element('#output').text.to.contain('The contents of the file was: Hello from parcel.js bundled ipfs example')
 
     browser.end()
   }
diff --git a/examples/browser-readablestream/test.js b/examples/browser-readablestream/test.js
index d6a6cd9a87..7434853ba8 100644
--- a/examples/browser-readablestream/test.js
+++ b/examples/browser-readablestream/test.js
@@ -8,7 +8,7 @@ module.exports = {
       .url(process.env.IPFS_EXAMPLE_TEST_URL)
       .waitForElementVisible('#output')
 
-    browser.expect.element('#output').text.to.contain('IPFS: Then press the "Go!" button to start playing a video').before(30000)
+    browser.expect.element('#output').text.to.contain('IPFS: Then press the "Go!" button to start playing a video')
 
     browser.executeAsync(async function (done) {
       const container = document.querySelector('#container')
@@ -244,7 +244,7 @@ module.exports = {
       done()
     })
 
-    browser.expect.element('#output').text.to.contain('IPFS: Added ').before(30000)
+    browser.expect.element('#output').text.to.contain('IPFS: Added ')
 
     browser.click('#gobutton')
       .executeAsync(function (done) {
diff --git a/examples/browser-script-tag/test.js b/examples/browser-script-tag/test.js
index 6c5f05ab51..fdbd20d070 100644
--- a/examples/browser-script-tag/test.js
+++ b/examples/browser-script-tag/test.js
@@ -21,7 +21,7 @@ module.exports = {
         }
       })
 
-    browser.expect.element('#status').text.to.contain('Node status: online').before(30000)
+    browser.expect.element('#status').text.to.contain('Node status: online')
 
     browser.end()
   }
diff --git a/examples/browser-vue/test.js b/examples/browser-vue/test.js
index bd542d6afe..34c1b461ce 100644
--- a/examples/browser-vue/test.js
+++ b/examples/browser-vue/test.js
@@ -8,7 +8,7 @@ module.exports = {
       .url(process.env.IPFS_EXAMPLE_TEST_URL)
       .waitForElementVisible('.ipfs-info')
 
-    browser.expect.element('.ipfs-info h1').text.to.contain('Connected to IPFS').before(30000)
+    browser.expect.element('.ipfs-info h1').text.to.contain('Connected to IPFS')
 
     browser.end()
   }
diff --git a/examples/browser-webpack/test.js b/examples/browser-webpack/test.js
index a4ac18a2f2..d8cdd3c63d 100644
--- a/examples/browser-webpack/test.js
+++ b/examples/browser-webpack/test.js
@@ -8,9 +8,9 @@ module.exports = {
       .url(process.env.IPFS_EXAMPLE_TEST_URL)
       .waitForElementVisible('#root h1')
 
-    browser.expect.element('#root h1').text.to.contain('Everything is working!').before(30000)
-    browser.expect.element('#root').text.to.contain('Added a file!').before(30000)
-    browser.expect.element('#root').text.to.contain('hello world from webpacked IPFS').before(30000)
+    browser.expect.element('#root h1').text.to.contain('Everything is working!')
+    browser.expect.element('#root').text.to.contain('Added a file!')
+    browser.expect.element('#root').text.to.contain('hello world from webpacked IPFS')
 
     browser.end()
   }
diff --git a/examples/circuit-relaying/test.js b/examples/circuit-relaying/test.js
index d66b48ee9e..3c295fd482 100644
--- a/examples/circuit-relaying/test.js
+++ b/examples/circuit-relaying/test.js
@@ -92,7 +92,7 @@ module.exports[pkg.name] = function (browser) {
     .pause(1000)
     .click('#connect')
 
-  browser.expect.element('#peers-addrs').text.to.contain(process.env.IPFS_RELAY_ADDRESS).before(30000)
+  browser.expect.element('#peers-addrs').text.to.contain(process.env.IPFS_RELAY_ADDRESS)
 
   // exchange peer info
   browser.getText('#addrs', (result) => {
@@ -129,7 +129,7 @@ module.exports[pkg.name] = function (browser) {
         .pause(1000)
         .click('#connect')
 
-      browser.expect.element('#peers-addrs').text.to.contain(remotePeerId).before(30000)
+      browser.expect.element('#peers-addrs').text.to.contain(remotePeerId)
 
       browser
         .clearValue('#message')
@@ -137,8 +137,8 @@ module.exports[pkg.name] = function (browser) {
         .pause(1000)
         .click('#send')
 
-      browser.expect.element('#msgs').text.to.contain(`${remotePeerId.substr(-4)}: hello`).before(30000)
-      browser.expect.element('#msgs').text.to.contain(`${localPeerId.substr(-4)}: hello`).before(30000)
+      browser.expect.element('#msgs').text.to.contain(`${remotePeerId.substr(-4)}: hello`)
+      browser.expect.element('#msgs').text.to.contain(`${localPeerId.substr(-4)}: hello`)
     })
 
   browser.end()
diff --git a/examples/exchange-files-in-browser/test.js b/examples/exchange-files-in-browser/test.js
index 82a6557fa5..bcd2ca7cab 100644
--- a/examples/exchange-files-in-browser/test.js
+++ b/examples/exchange-files-in-browser/test.js
@@ -85,7 +85,7 @@ module.exports[pkg.name] = function (browser) {
     .pause(1000)
     .click('#peer-btn')
 
-  browser.expect.element('#peers').text.to.contain(process.env.IPFS_RELAY_ADDRESS).before(30000)
+  browser.expect.element('#peers').text.to.contain(process.env.IPFS_RELAY_ADDRESS)
 
   browser
     .clearValue('#workspace-input')
@@ -93,7 +93,7 @@ module.exports[pkg.name] = function (browser) {
     .pause(1000)
     .click('#workspace-btn')
 
-  browser.expect.element('#logs').text.to.contain(`Subscribed to workspace #${process.env.IPFS_WORKSPACE_NAME}`).before(30000)
+  browser.expect.element('#logs').text.to.contain(`Subscribed to workspace #${process.env.IPFS_WORKSPACE_NAME}`)
 
   // only one browser should add the file to the workspace
   if (process.env.IPFS_ADD_FILE) {
@@ -104,11 +104,11 @@ module.exports[pkg.name] = function (browser) {
       .pause(1000)
       .click('#fetch-btn')
 
-    browser.expect.element('#logs').text.to.contain(`The ${process.env.IPFS_CID} file was added.`).before(30000)
+    browser.expect.element('#logs').text.to.contain(`The ${process.env.IPFS_CID} file was added.`)
   }
 
   // but should both see the added file
-  browser.expect.element('#file-history').text.to.contain(process.env.IPFS_CID).before(30000)
+  browser.expect.element('#file-history').text.to.contain(process.env.IPFS_CID)
 
   browser.end()
 }
diff --git a/examples/utils.js b/examples/utils.js
index 74450095d3..acb1147250 100644
--- a/examples/utils.js
+++ b/examples/utils.js
@@ -121,7 +121,7 @@ async function waitForOutput (expectedOutput, command, args = [], opts = {}) {
 
   const proc = execa(command, args, opts)
   let output = ''
-  let time = 30000
+  let time = 120000
 
   let timeout = setTimeout(() => {
     throw new Error(`Did not see "${expectedOutput}" in output from "${[command].concat(args).join(' ')}" after ${time/1000}s`)

From bb66ab112e89d586c947c16e4fa0c12b634c9521 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Fri, 11 Oct 2019 10:12:40 +0100
Subject: [PATCH 16/17] test: wait for other peer to join workspace before
 sending file

---
 .../exchange-files-in-browser/public/app.js   | 23 ++++-
 .../public/index.html                         | 15 +++-
 examples/exchange-files-in-browser/test.js    | 83 +++++++++++++++----
 3 files changed, 104 insertions(+), 17 deletions(-)

diff --git a/examples/exchange-files-in-browser/public/app.js b/examples/exchange-files-in-browser/public/app.js
index 928be5f857..f23ca84f14 100644
--- a/examples/exchange-files-in-browser/public/app.js
+++ b/examples/exchange-files-in-browser/public/app.js
@@ -10,7 +10,8 @@ const $nodeAddresses = document.querySelector('.node-addresses')
 const $logs = document.querySelector('#logs')
 // Peers
 const $peers = document.querySelector('#peers')
-const $peersList = $peers.querySelector('tbody')
+const $peersList = $peers.querySelector('#connected-peers')
+const $workspacePeersList = $peers.querySelector('#workspace-peers')
 const $multiaddrInput = document.querySelector('#multiaddr-input')
 const $connectButton = document.querySelector('#peer-btn')
 // Files
@@ -72,6 +73,15 @@ async function start () {
       }
     }, 1000)
 
+    setInterval(async () => {
+      try {
+        await refreshWorkspacePeerList()
+      } catch (err) {
+        err.message = `Failed to refresh the workspace peer list: ${err.message}`
+        onError(err)
+      }
+    }, 1000)
+
     setInterval(async () => {
       try {
         await sendFileList()
@@ -276,6 +286,17 @@ async function refreshPeerList () {
   $peersList.innerHTML = peersAsHtml
 }
 
+async function refreshWorkspacePeerList () {
+  const peers = await node.pubsub.peers(workspace)
+
+  const peersAsHtml = peers.reverse()
+    .map((addr) => {
+      return `<tr><td>${addr}</td></tr>`
+    }).join('')
+
+  $workspacePeersList.innerHTML = peersAsHtml
+}
+
 /* ===========================================================================
    Error handling
    =========================================================================== */
diff --git a/examples/exchange-files-in-browser/public/index.html b/examples/exchange-files-in-browser/public/index.html
index 6cfff8a1fd..cbf8000c59 100644
--- a/examples/exchange-files-in-browser/public/index.html
+++ b/examples/exchange-files-in-browser/public/index.html
@@ -44,7 +44,18 @@ <h3>Workspace</h3>
 
       <div class="columns">
         <div id="peers" class="box disabled">
-          <h2>Peers</h2>
+          <h2>Workspace Peers</h2>
+
+          <table>
+            <thead>
+              <tr>
+                <th>Connected Peers</th>
+              </tr>
+            </thead>
+            <tbody id="workspace-peers"></tbody>
+          </table>
+
+          <h2>Network Peers</h2>
 
           <div class="input-button">
             <input id="multiaddr-input" type="text" placeholder="Multiaddr" disabled />
@@ -57,7 +68,7 @@ <h2>Peers</h2>
                 <th>Connected Peers</th>
               </tr>
             </thead>
-            <tbody></tbody>
+            <tbody id="connected-peers"></tbody>
           </table>
         </div>
 
diff --git a/examples/exchange-files-in-browser/test.js b/examples/exchange-files-in-browser/test.js
index bcd2ca7cab..be41709401 100644
--- a/examples/exchange-files-in-browser/test.js
+++ b/examples/exchange-files-in-browser/test.js
@@ -1,7 +1,10 @@
 'use strict'
 
+const fs = require('fs-extra')
 const path = require('path')
+const os = require('os')
 const execa = require('execa')
+const delay = require('delay')
 const DaemonFactory = require('ipfsd-ctl')
 const df = DaemonFactory.create({
   type: 'js',
@@ -13,17 +16,13 @@ const {
 } = require('../utils')
 const pkg = require('./package.json')
 
-async function testUI (url, relay, cid, workspaceName, addFile) {
+async function testUI (env) {
   const proc = execa('nightwatch', [ path.join(__dirname, 'test.js') ], {
     cwd: path.resolve(__dirname, '../'),
     env: {
       ...process.env,
-      CI: true,
-      IPFS_EXAMPLE_TEST_URL: url,
-      IPFS_RELAY_ADDRESS: relay,
-      IPFS_CID: cid,
-      IPFS_WORKSPACE_NAME: workspaceName,
-      IPFS_ADD_FILE: addFile
+      ...env,
+      CI: true
     }
   })
   proc.all.on('data', (data) => {
@@ -61,10 +60,27 @@ async function runTest () {
     }
 
     let workspaceName = `test-${Date.now()}`
+    const peerA = path.join(os.tmpdir(), `test-${Date.now()}-a.txt`)
+    const peerB = path.join(os.tmpdir(), `test-${Date.now()}-b.txt`)
 
     await Promise.all([
-      testUI(server1.url, id.addresses[0], cid, workspaceName, true),
-      testUI(server2.url, id.addresses[0], cid, workspaceName)
+      testUI({
+        IPFS_EXAMPLE_TEST_URL: server1.url,
+        IPFS_RELAY_ADDRESS: id.addresses[0],
+        IPFS_CID: cid,
+        IPFS_WORKSPACE_NAME: workspaceName,
+        IPFS_ADD_FILE: true,
+        IPFS_LOCAL_PEER_ID_FILE: peerA,
+        IPFS_REMOTE_PEER_ID_FILE: peerB
+      }),
+      testUI({
+        IPFS_EXAMPLE_TEST_URL: server1.url,
+        IPFS_RELAY_ADDRESS: id.addresses[0],
+        IPFS_CID: cid,
+        IPFS_WORKSPACE_NAME: workspaceName,
+        IPFS_LOCAL_PEER_ID_FILE: peerB,
+        IPFS_REMOTE_PEER_ID_FILE: peerA
+      })
     ])
   } finally {
     await ipfsd.stop()
@@ -76,16 +92,27 @@ async function runTest () {
 module.exports = runTest
 
 module.exports[pkg.name] = function (browser) {
+  let localPeerId = null
+  let remotePeerId = null
+
   browser
     .url(process.env.IPFS_EXAMPLE_TEST_URL)
     .waitForElementVisible('.node-addresses li pre')
     .pause(1000)
+
+  console.info('dialling relay', process.env.IPFS_RELAY_ADDRESS)
+
+  browser
     .clearValue('#multiaddr-input')
     .setValue('#multiaddr-input', process.env.IPFS_RELAY_ADDRESS)
     .pause(1000)
     .click('#peer-btn')
 
-  browser.expect.element('#peers').text.to.contain(process.env.IPFS_RELAY_ADDRESS)
+  const relayPeerId = process.env.IPFS_RELAY_ADDRESS.split('/').pop()
+
+  browser.expect.element('#connected-peers').text.to.contain(relayPeerId)
+
+  console.info('joining workspace', process.env.IPFS_WORKSPACE_NAME)
 
   browser
     .clearValue('#workspace-input')
@@ -93,18 +120,46 @@ module.exports[pkg.name] = function (browser) {
     .pause(1000)
     .click('#workspace-btn')
 
-  browser.expect.element('#logs').text.to.contain(`Subscribed to workspace #${process.env.IPFS_WORKSPACE_NAME}`)
+  // exchange peer info
+  browser.getText('.node-id', (result) => {
+    localPeerId = result.value.trim()
+    console.info('got local peer id', localPeerId)
+  })
+    .perform(async (browser, done) => {
+      console.info('writing local peer id')
+      await fs.writeFile(process.env.IPFS_LOCAL_PEER_ID_FILE, localPeerId)
+
+      console.info('reading remote peer id')
+      for (let i = 0; i < 100; i++) {
+        try {
+          remotePeerId = await fs.readFile(process.env.IPFS_REMOTE_PEER_ID_FILE, {
+            encoding: 'utf8'
+          })
+
+          console.info('got remote peer id', remotePeerId)
+          done()
+
+          break
+        } catch (err) {
+
+        }
+
+        await delay(1000)
+      }
+
+      console.info('waiting for remote peer', remotePeerId, 'to join workspace')
+      browser.expect.element('#workspace-peers').text.to.contain(remotePeerId)
+
+      await delay(1000)
+    })
 
   // only one browser should add the file to the workspace
   if (process.env.IPFS_ADD_FILE) {
-    // add the file from the server
     browser
       .clearValue('#cid-input')
       .setValue('#cid-input', process.env.IPFS_CID)
       .pause(1000)
       .click('#fetch-btn')
-
-    browser.expect.element('#logs').text.to.contain(`The ${process.env.IPFS_CID} file was added.`)
   }
 
   // but should both see the added file

From 3943b5343ba495df09f78a6fc62cec46688c4562 Mon Sep 17 00:00:00 2001
From: achingbrain <alex@achingbrain.net>
Date: Fri, 11 Oct 2019 10:55:27 +0100
Subject: [PATCH 17/17] chore: tidy up deps

---
 examples/README.md                           | 2 +-
 examples/browser-add-readable-stream/test.js | 2 +-
 examples/circuit-relaying/package.json       | 1 -
 examples/package.json                        | 7 ++++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/README.md b/examples/README.md
index 53afb94431..0c08338979 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -56,7 +56,7 @@ All examples should include a `test.js` file.  The implementation will differ de
 
 ### Browser `test.js`
 
-All browser examples should either be a whole webapp or a simple demo.
+All browser examples should either be a whole webapp or a simple demo (e.g. just `index.html` and `index.js` files).
 
 #### Webapp
 
diff --git a/examples/browser-add-readable-stream/test.js b/examples/browser-add-readable-stream/test.js
index e16b977c4a..87f76119ca 100644
--- a/examples/browser-add-readable-stream/test.js
+++ b/examples/browser-add-readable-stream/test.js
@@ -10,4 +10,4 @@ module.exports = {
 
     browser.end()
   }
-}
\ No newline at end of file
+}
diff --git a/examples/circuit-relaying/package.json b/examples/circuit-relaying/package.json
index 6ea3f67d79..4a667afd04 100644
--- a/examples/circuit-relaying/package.json
+++ b/examples/circuit-relaying/package.json
@@ -19,7 +19,6 @@
   },
   "devDependencies": {
     "aegir": "^20.0.0",
-    "execa": "^2.1.0",
     "ipfs-css": "^0.13.1",
     "parcel-bundler": "^1.6.2",
     "tachyons": "^4.9.1"
diff --git a/examples/package.json b/examples/package.json
index eb99d19798..dd98a16161 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -3,16 +3,17 @@
   "version": "1.0.0",
   "description": "Examples of how to use IPFS",
   "scripts": {
-    "test": "node ./test.js"
+    "test": "node ./test.js",
+    "test:all": "node ./test-all.js"
   },
   "license": "MIT",
   "dependencies": {
     "chromedriver": "^77.0.0",
+    "delay": "^4.1.0",
     "execa": "^2.1.0",
     "fs-extra": "^8.1.0",
     "http-server": "~0.11.1",
     "nightwatch": "^1.2.4",
-    "which": "^2.0.1",
-    "why-is-node-running": "^2.1.0"
+    "which": "^2.0.1"
   }
 }