Skip to content
This repository was archived by the owner on Mar 10, 2020. It is now read-only.

Commit 7dcb3c4

Browse files
authored
Merge pull request #340 from ipfs/feat/ipfs-factory
feat(factory): use the factory mode
2 parents 6948370 + d5ec781 commit 7dcb3c4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+321
-74
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
node_modules
22
*.log
3-
test/tmp-disposable-nodes-addrs.json
3+
test/setup/tmp-disposable-nodes-addrs.json
44
dist
55
lib
6-
coverage
6+
coverage

gulpfile.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,12 @@
22

33
const gulp = require('gulp')
44

5-
require('./tasks/test')
5+
require('./test/setup/spawn-daemons')
6+
require('./test/factory/factory-tasks')
7+
8+
gulp.task('test:node:before', ['daemons:start', 'factory:start'])
9+
gulp.task('test:node:after', ['daemons:stop', 'factory:stop'])
10+
gulp.task('test:browser:before', ['daemons:start', 'factory:start'])
11+
gulp.task('test:browser:after', ['daemons:stop', 'factory:stop'])
12+
613
require('aegir/gulp')(gulp)

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,13 @@
3333
"aegir": "^6.0.0",
3434
"chai": "^3.5.0",
3535
"gulp": "^3.9.1",
36-
"interface-ipfs-core": "^0.6.0",
36+
"hapi": "^14.1.0",
37+
"interface-ipfs-core": "^0.7.2",
3738
"ipfsd-ctl": "^0.14.0",
3839
"passthrough-counter": "^1.0.0",
3940
"pre-commit": "^1.1.3",
41+
"socket.io": "^1.4.8",
42+
"socket.io-client": "^1.4.8",
4043
"stream-equal": "^0.1.8",
4144
"stream-http": "^2.3.1",
4245
"streamifier": "^0.1.1"

tasks/test.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

test/api/object.spec.js

Lines changed: 0 additions & 17 deletions
This file was deleted.

test/browser.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
'use strict'
22

3-
require('./setup')
3+
require('./setup/setup-ipfs-api-clients')
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)