Skip to content

Commit 28682d4

Browse files
jt-ntimbwhite
authored andcommitted
[FABCN-359] Add ledger dev dependency to docs
fabric-ledger is typescript however the jsdoc is currently generated from the built javascript so need to add a dependency to the docs package Signed-off-by: James Taylor <jamest@uk.ibm.com>
1 parent d4d6711 commit 28682d4

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

ci/azure-pipelines.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ stages:
8989
- script: |
9090
mkdir -p $(Build.ArtifactStagingDirectory)/logs
9191
find . \( -type d -name 'node_modules' \) -prune -o -name '*.build*.log' -exec cp {} $(Build.ArtifactStagingDirectory)/logs \;
92+
condition: or(succeeded(), failed()) # publish either way
9293
displayName: 'Copy build logs'
9394
- task: PublishBuildArtifacts@1
9495
condition: or(succeeded(), failed()) # publish either way

docs/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"docs": "rimraf ./gen && jsdoc -c ./_jsdoc.json"
99
},
1010
"devDependencies": {
11+
"fabric-ledger": "2.1.0-unstable",
1112
"ink-docstrap": "^1.3.2",
1213
"jsdoc": "^3.6.3",
1314
"rimraf": "^3.0.0"

libraries/fabric-shim/test/unit/cli.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,16 @@ describe('fabric-chaincode-node cli', () => {
3838

3939
afterEach(() => {
4040
sandbox.restore();
41+
delete require.cache[require.resolve('../../cli.js')];
4142
});
4243

4344
describe('Main test', () => {
4445
it('should setup yargs correctly', () => {
4546
sandbox.stub(yargs, 'describe').returns(yargs);
4647
sandbox.stub(yargs, 'env').returns(yargs);
48+
4749
require('../../cli.js');
50+
4851
sinon.assert.calledOnce(yargs.commandDir);
4952
sinon.assert.calledWith(yargs.commandDir, './lib/cmds');
5053
sinon.assert.calledOnce(yargs.demandCommand);
@@ -64,9 +67,8 @@ describe('fabric-chaincode-node cli', () => {
6467
thePromise: Promise.resolve()
6568
}
6669
});
67-
delete require.cache[require.resolve('../../cli.js')];
70+
6871
require('../../cli.js');
69-
7072
});
7173

7274
it('should handle rejected promise correctly', () => {
@@ -76,9 +78,8 @@ describe('fabric-chaincode-node cli', () => {
7678
thePromise: Promise.reject()
7779
}
7880
});
79-
delete require.cache[require.resolve('../../cli.js')];
80-
require('../../cli.js');
8181

82+
require('../../cli.js');
8283
});
8384
});
8485
});

0 commit comments

Comments
 (0)