Skip to content

Commit ab8b0f3

Browse files
committed
Added missing files to last commit
1 parent fb3bb93 commit ab8b0f3

File tree

6 files changed

+22
-18
lines changed

6 files changed

+22
-18
lines changed

Diff for: package-lock.json

+12-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: tests/agent/test.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ NC='\033[0m'
1717

1818
# kill and remove any running containers
1919
cleanup () {
20-
docker-compose -p ${PROJECT} kill; docker-compose -p ${PROJECT} rm -fv
20+
docker compose -p ${PROJECT} kill; docker compose -p ${PROJECT} rm -fv
2121
}
2222
# catch unexpected failures, do cleanup and output an error message
2323
trap 'cleanup ; printf "${RED}Tests Failed For Unexpected Reasons${NC}\n"'\
2424
HUP INT QUIT PIPE TERM
2525

2626
# run the composed services
27-
docker-compose build && docker-compose -p ${PROJECT} up -d
27+
docker compose build && docker compose -p ${PROJECT} up -d
2828

2929
if [ $? -ne 0 ]; then
3030
printf "${RED}Docker Compose Failed (${TEST_CONT})${NC}\n"

Diff for: tests/client/fixtures/agent.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const Foo = require('./Foo')
33
const Bar = require('./Bar')
44
const { VrpcAdapter, VrpcAgent } = require('../../../index')
55

6-
VrpcAdapter.register(Foo, { jsdocPath: './Foo' })
6+
VrpcAdapter.register(Foo, { jsdocPath: './Foo.js' })
77
VrpcAdapter.register(Bar)
88

99
async function main () {

Diff for: tests/client/test.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ NC='\033[0m'
1717

1818
# kill and remove any running containers
1919
cleanup () {
20-
docker-compose -p ${PROJECT} kill; docker-compose -p ${PROJECT} rm -fv
20+
docker compose -p ${PROJECT} kill; docker compose -p ${PROJECT} rm -fv
2121
}
2222
# catch unexpected failures, do cleanup and output an error message
2323
trap 'cleanup ; printf "${RED}Tests Failed For Unexpected Reasons${NC}\n"'\
2424
HUP INT QUIT PIPE TERM
2525

2626
# run the composed services
27-
docker-compose build && docker-compose -p ${PROJECT} up -d
27+
docker compose build && docker compose -p ${PROJECT} up -d
2828

2929
if [ $? -ne 0 ]; then
3030
printf "${RED}Docker Compose Failed (${TEST_CONT})${NC}\n"

Diff for: tests/performance/test.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ NC='\033[0m'
1717

1818
# kill and remove any running containers
1919
cleanup () {
20-
docker-compose -p ${PROJECT} down
20+
docker compose -p ${PROJECT} down
2121
}
2222
# catch unexpected failures, do cleanup and output an error message
2323
trap 'cleanup ; printf "${RED}Tests Failed For Unexpected Reasons${NC}\n"'\
2424
HUP INT QUIT PIPE TERM
2525

2626
# run the composed services
27-
docker-compose build &&
28-
docker-compose -p ${PROJECT} up -d
27+
docker compose build &&
28+
docker compose -p ${PROJECT} up -d
2929

3030
if [ $? -ne 0 ]; then
3131
printf "${RED}Docker Compose Failed (${TEST_CONT})${NC}\n"

Diff for: vrpc/VrpcAdapter.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,8 @@ class VrpcAdapter {
111111
this._registerClass(Klass, absJsdocPath, options)
112112
} else {
113113
const { jsdocPath } = options
114-
const sJsdocPath =
115-
jsdocPath && jsdocPath.endsWith('.js') ? jsdocPath : `${jsdocPath}.js`
116114
if (jsdocPath) {
117-
const absJsdocPath = path.resolve(caller(), '../', sJsdocPath)
115+
const absJsdocPath = path.resolve(caller(), '../', jsdocPath)
118116
this._registerClass(code, absJsdocPath, { ...options, jsdoc: true })
119117
} else {
120118
this._registerClass(code, null, options)
@@ -146,7 +144,7 @@ class VrpcAdapter {
146144
}
147145
let meta = null
148146
if (jsdocPath) {
149-
const absJsdocPath = path.resolve(caller(), '../', `${jsdocPath}.js`)
147+
const absJsdocPath = path.resolve(caller(), '../', jsdocPath)
150148
const content = fs.readFileSync(absJsdocPath).toString('utf8')
151149
meta = this._parseComments(content)
152150
}

0 commit comments

Comments
 (0)