Skip to content

Commit 2e41054

Browse files
authored
Merge pull request #456 from strongloop/update-deps
Update dependencies to latest
2 parents 809677b + ec0e101 commit 2e41054

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

Diff for: .mocharc.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"reporter": "spec",
3+
"timeout": 10000,
4+
"require": "test/init.js",
5+
"exit": true
6+
}

Diff for: package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@
3131
"bluebird": "^3.4.6",
3232
"chalk": "^4.0.0",
3333
"debug": "^4.1.1",
34-
"loopback-connector": "^4.10.2",
34+
"loopback-connector": "^5.0.0",
3535
"pg": "^8.0.2",
3636
"strong-globalize": "^6.0.0",
37-
"uuid": "^7.0.3"
37+
"uuid": "^8.3.0"
3838
},
3939
"devDependencies": {
40-
"eslint": "^6.0.1",
40+
"eslint": "^7.7.0",
4141
"eslint-config-loopback": "^13.1.0",
4242
"juggler-v3": "file:./deps/juggler-v3",
4343
"juggler-v4": "file:./deps/juggler-v4",
4444
"lodash": "^4.17.4",
4545
"loopback-datasource-juggler": "^3.0.0 || ^4.0.0",
46-
"mocha": "^7.1.1",
46+
"mocha": "^8.1.2",
4747
"rc": "^1.0.0",
4848
"should": "^13.2.3",
4949
"sinon": "^9.0.2"

Diff for: setup.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ docker -v > /dev/null 2>&1
3838
DOCKER_EXISTS=$?
3939
if [ "$DOCKER_EXISTS" -ne 0 ]; then
4040
printf "\n\n${CYAN}Status: ${PLAIN}${RED}Docker not found. Terminating setup.${PLAIN}\n\n"
41-
exit 1
41+
return 1
4242
fi
4343
printf "\n${CYAN}Found docker. Moving on with the setup.${PLAIN}\n"
4444

@@ -57,7 +57,7 @@ printf "\n${RED}>> Starting the postgresql container${PLAIN} ${GREEN}...${PLAIN}
5757
CONTAINER_STATUS=$(docker run --name $POSTGRESQL_CONTAINER -e POSTGRES_USER=$USER -e POSTGRES_PASSWORD=$PASSWORD -p $PORT:5432 -d postgres:latest 2>&1)
5858
if [[ "$CONTAINER_STATUS" == *"Error"* ]]; then
5959
printf "\n\n${CYAN}Status: ${PLAIN}${RED}Error starting container. Terminating setup.${PLAIN}\n\n"
60-
exit 1
60+
return 1
6161
fi
6262
docker cp ./test/schema.sql $POSTGRESQL_CONTAINER:/home/ > /dev/null 2>&1
6363
printf "\n${CYAN}Container is up and running.${PLAIN}\n"
@@ -91,7 +91,7 @@ while [ "$OUTPUT" -ne 0 ] && [ "$TIMEOUT" -gt 0 ]
9191

9292
if [ "$TIMEOUT" -le 0 ]; then
9393
printf "\n\n${CYAN}Status: ${PLAIN}${RED}Failed to export schema. Terminating setup.${PLAIN}\n\n"
94-
exit 1
94+
return 1
9595
fi
9696
printf "\n${CYAN}Successfully exported schema to database.${PLAIN}\n"
9797

@@ -102,7 +102,7 @@ docker exec -it $POSTGRESQL_CONTAINER /bin/sh -c "psql -U $USER -c 'CREATE DATAB
102102
CREATE_DATABASE=$?
103103
if [ "$CREATE_DATABASE" -ne 0 ]; then
104104
printf "\n\n${CYAN}Status: ${PLAIN}${RED}Error creating database: $DATABASE. Terminating setup.${PLAIN}\n\n"
105-
exit 1
105+
return 1
106106
fi
107107
printf "\n${CYAN}Database created.${PLAIN}\n"
108108

Diff for: test/mocha.opts

-4
This file was deleted.

0 commit comments

Comments
 (0)