From 4781ffd9e048692e7b438512cf3a00a222669934 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Tue, 15 Oct 2019 15:00:59 -0700 Subject: [PATCH 1/6] fixes clearall bug in focusterm --- components/interface/FocusTerm.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/components/interface/FocusTerm.js b/components/interface/FocusTerm.js index 86bd2b2ce..c71e54bef 100644 --- a/components/interface/FocusTerm.js +++ b/components/interface/FocusTerm.js @@ -28,9 +28,14 @@ export default class FocusTerm extends React.Component { window.addVfbId(window[window.templateID].getId()); if (Instances[i].parent != null) { Instances[i].parent.delete(); + // Delete instance too after deleting parent + if(Instances[i] != null) { + Instances[i].delete() + } } else { Instances[i].delete() } + i = i - 1; // Since an array element has been deleted, index is updated too } } } From 743c743334723f192ee4b43f7f826f0bdca7d546 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Tue, 15 Oct 2019 15:19:59 -0700 Subject: [PATCH 2/6] eslint fix --- components/interface/FocusTerm.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/interface/FocusTerm.js b/components/interface/FocusTerm.js index c71e54bef..b69b563fa 100644 --- a/components/interface/FocusTerm.js +++ b/components/interface/FocusTerm.js @@ -29,8 +29,8 @@ export default class FocusTerm extends React.Component { if (Instances[i].parent != null) { Instances[i].parent.delete(); // Delete instance too after deleting parent - if(Instances[i] != null) { - Instances[i].delete() + if (Instances[i] != null) { + Instances[i].delete() } } else { Instances[i].delete() From 524c788288aab3b9952b31128ad6a860b8b91efd Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 17 Oct 2019 17:40:54 -0700 Subject: [PATCH 3/6] add "test": "jest --verbose" package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 36282b878..a5a0e6cc6 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "repository": "http://git.geppetto.org", "license": "MIT", "scripts": { + "test": "jest --verbose", "prebuild": "eslint . --color", "build": "webpack -p --progress", "prebuild-dev": "eslint . --color", From d358ad2a78ea8b740d9755fdc3d8276c8d5e2c78 Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 17 Oct 2019 18:01:29 -0700 Subject: [PATCH 4/6] config changes for running jest tests --- babel.config.js | 8 ++++++++ jest.config.js | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 babel.config.js diff --git a/babel.config.js b/babel.config.js new file mode 100644 index 000000000..438b394fa --- /dev/null +++ b/babel.config.js @@ -0,0 +1,8 @@ +module.exports = { + presets: [ + [ + '@babel/preset-env', + { targets: { node: 'current' } }, + ], + ], +}; \ No newline at end of file diff --git a/jest.config.js b/jest.config.js index 4ec77dd37..aa9ed59d6 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,5 +1,4 @@ module.exports = { "preset": "jest-puppeteer", - "moduleDirectories": ["node_modules", "node_modules"], "testRegex": "(/tests/jest/vfb/.*|(\\.|/)(test|spec))\\-tests.[jt]sx?$" }; \ No newline at end of file From 7b8a9d3433915e774e18f48a6f9f485e3321b71e Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 17 Oct 2019 18:17:11 -0700 Subject: [PATCH 5/6] add jest dependencies --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7ee1147d0..d7b12d4a6 100755 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo ${TRAVIS_BRANCH/\//-}; fi` - export TAG=`if [ "$BUILD_TYPE" == "development" ]; then echo "$TAG-development"; else echo "$TAG"; fi` install: - - npm install jest@24.8.0 puppeteer@1.17.0 jest-puppeteer@3.9.0 babel-preset-env@1.6.0 url-join@4.0.0 + - npm install -g jest@24.8.0 puppeteer@1.17.0 jest-puppeteer@4.3.0 @babel/preset-env@7.4.5 url-join@4.0.0 @babel/core@7.4.5 before_script: - docker pull metacell/java-virgo-maven:development || true script: From 82a1dbb1fd5c1b68588200214d6fe6049e6807cf Mon Sep 17 00:00:00 2001 From: jrmartin Date: Thu, 17 Oct 2019 18:31:00 -0700 Subject: [PATCH 6/6] remove -g flag from npm install in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d7b12d4a6..856640f13 100755 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo ${TRAVIS_BRANCH/\//-}; fi` - export TAG=`if [ "$BUILD_TYPE" == "development" ]; then echo "$TAG-development"; else echo "$TAG"; fi` install: - - npm install -g jest@24.8.0 puppeteer@1.17.0 jest-puppeteer@4.3.0 @babel/preset-env@7.4.5 url-join@4.0.0 @babel/core@7.4.5 + - npm install jest@24.8.0 puppeteer@1.17.0 jest-puppeteer@4.3.0 @babel/preset-env@7.4.5 url-join@4.0.0 @babel/core@7.4.5 before_script: - docker pull metacell/java-virgo-maven:development || true script: