Skip to content

Commit

Permalink
Merge #6981
Browse files Browse the repository at this point in the history
6981: Update yarn dependencies r=jmcameron a=jmcameron

Over time, our yarn dependencies have gathered some unneeded, duplicate dependencies.  This PR updates the dependencies in the yarn.lock file to clean that up.  

This PR also disables the protractor end-to-end tests from the 'yarn test' test script.   This will be updated when we have migrated to a new framework for end-to-end tests.

### TESTING

- run 'yarn' to update the dependencies
- run 'yarn check' to verify that redundant dependencies have been removed.
- run 'yarn test' to verify that the tests still run on your system
- Try doing running the GUI (with bhima_test)
   - yarn build:db
   - yarn dev
   - try some test operations 



Co-authored-by: Jonathan Cameron <jmcameron@gmail.com>
  • Loading branch information
bors[bot] and jmcameron authored Apr 3, 2023
2 parents 4a99c9b + d7f698c commit 2efc16a
Show file tree
Hide file tree
Showing 3 changed files with 1,527 additions and 1,562 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
"debug": "^4.3.4",
"delay": "^5.0.0",
"dotenv": "^16.0.2",
"eslint-plugin-jsdoc": "^40.0.1",
"excel4node": "^1.8.1",
"express": "^4.18.2",
"express-handlebars": "^7.0.4",
Expand All @@ -130,7 +131,7 @@
"luxon": "^3.3.0",
"moment": "^2.29.4",
"morgan": "^1.9.1",
"multer": "^1.4.4",
"multer": "^1.4.5-lts.1",
"muze": "^1.2.1",
"mysql": "^2.16.0",
"ng-file-upload": "^12.2.13",
Expand Down
10 changes: 5 additions & 5 deletions sh/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ if [ $SUITE = "integration-stock" ] || [ $SUITE = "ALL" ] ; then
fi

# run end to end tests
if [ $SUITE = "end-to-end" ] || [ $SUITE = "ALL" ] ; then
startfold "Running Client End to End Tests..." "test-end-to-end";
./sh/test-ends.sh
endfold "test-end-to-end" ;
fi
# if [ $SUITE = "end-to-end" ] || [ $SUITE = "ALL" ] ; then
# startfold "Running Client End to End Tests..." "test-end-to-end";
# ./sh/test-ends.sh
# endfold "test-end-to-end" ;
# fi

exit 0;
Loading

0 comments on commit 2efc16a

Please sign in to comment.