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

Tests randomly fail as fighting over connection profile #16

Merged
merged 1 commit into from
Mar 15, 2017
Merged

Tests randomly fail as fighting over connection profile #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/animaltracking-network/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"postlint": "npm run licchk",
"licchk": "license-check",
"postlicchk": "npm run doc",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf",
"pkgstamp": "node ./scripts/pkgstamp.js"
},
"repository": {
Expand All @@ -26,6 +26,7 @@
"movement"
],
"devDependencies": {
"browserfs": "^1.2.0",
"composer-cli": "latest",
"eslint": "^3.6.1",
"jsdoc": "^3.4.1",
Expand Down
5 changes: 3 additions & 2 deletions packages/bond-network/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"postlint": "npm run licchk",
"licchk": "license-check",
"postlicchk": "npm run doc",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf",
"test": "mocha --recursive",
"deploy": "./scripts/deploy.sh"
},
Expand All @@ -25,11 +25,12 @@
"author": "Fabric Composer",
"license": "Apache-2.0",
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-admin": "latest",
"composer-cli": "latest",
"composer-client": "latest",
"composer-connector-embedded": "latest",
"chai": "^3.5.0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
Expand Down
7 changes: 5 additions & 2 deletions packages/bond-network/test/Bond.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,23 @@
'use strict';

const AdminConnection = require('composer-admin').AdminConnection;
const BrowserFS = require('browserfs/dist/node/index');
const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
const path = require('path');

require('chai').should();

const bfs_fs = BrowserFS.BFSRequire('fs');
const NS = 'org.acme.bond';

describe('Publish Bond', () => {

let businessNetworkConnection;

before(() => {
const adminConnection = new AdminConnection();
BrowserFS.initialize(new BrowserFS.FileSystem.InMemory());
const adminConnection = new AdminConnection({ fs: bfs_fs });
return adminConnection.createProfile('defaultProfile', {
type: 'embedded'
})
Expand All @@ -42,7 +45,7 @@ describe('Publish Bond', () => {
return adminConnection.deploy(businessNetworkDefinition);
})
.then(() => {
businessNetworkConnection = new BusinessNetworkConnection();
businessNetworkConnection = new BusinessNetworkConnection({ fs: bfs_fs });
return businessNetworkConnection.connect('defaultProfile', 'bond-network', 'WebAppAdmin', 'DJY27pEnl16d');
});
});
Expand Down
5 changes: 3 additions & 2 deletions packages/carauction-network/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"postlint": "npm run licchk",
"licchk": "license-check",
"postlicchk": "npm run doc",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf",
"test": "mocha --recursive",
"deploy": "./scripts/deploy.sh"
},
Expand All @@ -24,11 +24,12 @@
"author": "Fabric Composer",
"license": "Apache-2.0",
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-admin": "latest",
"composer-cli": "latest",
"composer-client": "latest",
"composer-connector-embedded": "latest",
"chai": "^3.5.0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
Expand Down
7 changes: 5 additions & 2 deletions packages/carauction-network/test/CarAuction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
'use strict';

const AdminConnection = require('composer-admin').AdminConnection;
const BrowserFS = require('browserfs/dist/node/index');
const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
const path = require('path');

require('chai').should();

const bfs_fs = BrowserFS.BFSRequire('fs');
const NS = 'org.acme.vehicle.auction';

describe('CarAuction', () => {
Expand All @@ -29,7 +31,8 @@ describe('CarAuction', () => {
let businessNetworkConnection;

before(() => {
const adminConnection = new AdminConnection();
BrowserFS.initialize(new BrowserFS.FileSystem.InMemory());
const adminConnection = new AdminConnection({ fs: bfs_fs });
return adminConnection.createProfile('defaultProfile', {
type: 'embedded'
})
Expand All @@ -43,7 +46,7 @@ describe('CarAuction', () => {
return adminConnection.deploy(businessNetworkDefinition);
})
.then(() => {
businessNetworkConnection = new BusinessNetworkConnection();
businessNetworkConnection = new BusinessNetworkConnection({ fs: bfs_fs });
return businessNetworkConnection.connect('defaultProfile', 'carauction-network', 'WebAppAdmin', 'DJY27pEnl16d');
});
});
Expand Down
5 changes: 3 additions & 2 deletions packages/digitalproperty-network/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"postlint": "npm run licchk",
"licchk": "license-check",
"postlicchk": "npm run doc",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf",
"test": "mocha --recursive",
"deploy": "./scripts/deploy.sh"
},
Expand All @@ -23,11 +23,12 @@
"author": "Fabric Composer",
"license": "Apache-2.0",
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-admin": "latest",
"composer-cli": "latest",
"composer-client": "latest",
"composer-connector-embedded": "latest",
"chai": "^3.5.0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
Expand Down
7 changes: 5 additions & 2 deletions packages/digitalproperty-network/test/DigitalLandTitle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,22 @@
'use strict';

const AdminConnection = require('composer-admin').AdminConnection;
const BrowserFS = require('browserfs/dist/node/index');
const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
const path = require('path');

require('chai').should();

const bfs_fs = BrowserFS.BFSRequire('fs');
describe('DigitalLandTitle', () => {

let adminConnection;
let businessNetworkConnection;

before(() => {
adminConnection = new AdminConnection();
BrowserFS.initialize(new BrowserFS.FileSystem.InMemory());
const adminConnection = new AdminConnection({ fs: bfs_fs });
return adminConnection.createProfile('testprofile', { type: 'embedded' })
.then(() => {
return adminConnection.connect('testprofile', 'WebAppAdmin', 'DJY27pEnl16d');
Expand All @@ -39,7 +42,7 @@ describe('DigitalLandTitle', () => {
return adminConnection.deploy(businessNetworkDefinition);
})
.then(() => {
businessNetworkConnection = new BusinessNetworkConnection();
businessNetworkConnection = new BusinessNetworkConnection({ fs: bfs_fs });
return businessNetworkConnection.connect('testprofile', 'digitalproperty-network', 'WebAppAdmin', 'DJY27pEnl16d');
});
});
Expand Down
5 changes: 3 additions & 2 deletions packages/marbles-network/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"postlint": "npm run licchk",
"licchk": "license-check",
"postlicchk": "npm run doc",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf",
"test": "mocha --recursive",
"deploy": "./scripts/deploy.sh"
},
Expand All @@ -25,11 +25,12 @@
"author": "Fabric Composer",
"license": "Apache-2.0",
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-admin": "latest",
"composer-cli": "latest",
"composer-client": "latest",
"composer-connector-embedded": "latest",
"chai": "^3.5.0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
Expand Down
7 changes: 5 additions & 2 deletions packages/marbles-network/test/MarblesTests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
'use strict';

const AdminConnection = require('composer-admin').AdminConnection;
const BrowserFS = require('browserfs/dist/node/index');
const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
const path = require('path');

require('chai').should();

const bfs_fs = BrowserFS.BFSRequire('fs');
const NS = 'org.fabric_composer.marbles';

describe('Marbles', () => {
Expand All @@ -29,7 +31,8 @@ describe('Marbles', () => {
let businessNetworkConnection;

before(() => {
const adminConnection = new AdminConnection();
BrowserFS.initialize(new BrowserFS.FileSystem.InMemory());
const adminConnection = new AdminConnection({ fs: bfs_fs });
return adminConnection.createProfile('defaultProfile', {
type: 'embedded'
})
Expand All @@ -43,7 +46,7 @@ describe('Marbles', () => {
return adminConnection.deploy(businessNetworkDefinition);
})
.then(() => {
businessNetworkConnection = new BusinessNetworkConnection();
businessNetworkConnection = new BusinessNetworkConnection({ fs: bfs_fs });
return businessNetworkConnection.connect('defaultProfile', 'marbles-network', 'WebAppAdmin', 'DJY27pEnl16d');
});
});
Expand Down
5 changes: 3 additions & 2 deletions packages/perishable-network/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"postlint": "npm run licchk",
"licchk": "license-check",
"postlicchk": "npm run doc",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf",
"test": "mocha --recursive",
"deploy": "./scripts/deploy.sh"
},
Expand All @@ -26,11 +26,12 @@
"author": "Fabric Composer",
"license": "Apache-2.0",
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-admin": "latest",
"composer-cli": "latest",
"composer-client": "latest",
"composer-connector-embedded": "latest",
"chai": "^3.5.0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
Expand Down
7 changes: 5 additions & 2 deletions packages/perishable-network/test/perishable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
'use strict';

const AdminConnection = require('composer-admin').AdminConnection;
const BrowserFS = require('browserfs/dist/node/index');
const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
const path = require('path');

require('chai').should();

const bfs_fs = BrowserFS.BFSRequire('fs');
const NS = 'org.acme.shipping.perishable';
let grower_id = 'farmer@email.com';
let importer_id = 'supermarket@email.com';
Expand All @@ -31,7 +33,8 @@ describe('Perishable Shipping Network', () => {
let businessNetworkConnection;

before(() => {
const adminConnection = new AdminConnection();
BrowserFS.initialize(new BrowserFS.FileSystem.InMemory());
const adminConnection = new AdminConnection({ fs: bfs_fs });
return adminConnection.createProfile('defaultProfile', {
type: 'embedded'
})
Expand All @@ -45,7 +48,7 @@ describe('Perishable Shipping Network', () => {
return adminConnection.deploy(businessNetworkDefinition);
})
.then(() => {
businessNetworkConnection = new BusinessNetworkConnection();
businessNetworkConnection = new BusinessNetworkConnection({ fs: bfs_fs });
return businessNetworkConnection.connect('defaultProfile', 'perishable-network', 'WebAppAdmin', 'DJY27pEnl16d');
})
.then(() => {
Expand Down
5 changes: 3 additions & 2 deletions packages/sample-network/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"postlint": "npm run licchk",
"licchk": "license-check",
"postlicchk": "npm run doc",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf .",
"doc": "jsdoc --pedantic --recurse -c jsdoc.conf",
"test": "mocha --recursive",
"deploy": "./scripts/deploy.sh"
},
Expand All @@ -24,11 +24,12 @@
"author": "Fabric Composer",
"license": "Apache-2.0",
"devDependencies": {
"browserfs": "^1.2.0",
"chai": "^3.5.0",
"composer-admin": "latest",
"composer-cli": "latest",
"composer-client": "latest",
"composer-connector-embedded": "latest",
"chai": "^3.5.0",
"eslint": "^3.6.1",
"istanbul": "^0.4.5",
"jsdoc": "^3.4.1",
Expand Down
7 changes: 5 additions & 2 deletions packages/sample-network/test/Sample.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
'use strict';

const AdminConnection = require('composer-admin').AdminConnection;
const BrowserFS = require('browserfs/dist/node/index');
const BusinessNetworkConnection = require('composer-client').BusinessNetworkConnection;
const BusinessNetworkDefinition = require('composer-common').BusinessNetworkDefinition;
const path = require('path');

require('chai').should();

const bfs_fs = BrowserFS.BFSRequire('fs');
const NS = 'org.acme.sample';

describe('Sample', () => {
Expand All @@ -29,7 +31,8 @@ describe('Sample', () => {
let businessNetworkConnection;

before(() => {
const adminConnection = new AdminConnection();
BrowserFS.initialize(new BrowserFS.FileSystem.InMemory());
const adminConnection = new AdminConnection({ fs: bfs_fs });
return adminConnection.createProfile('defaultProfile', {
type : 'embedded'
})
Expand All @@ -43,7 +46,7 @@ describe('Sample', () => {
return adminConnection.deploy(businessNetworkDefinition);
})
.then(() => {
businessNetworkConnection = new BusinessNetworkConnection();
businessNetworkConnection = new BusinessNetworkConnection({ fs: bfs_fs });
return businessNetworkConnection.connect('defaultProfile', 'sample-network', 'WebAppAdmin', 'DJY27pEnl16d');
});
});
Expand Down