From f216c2df836fba3537fe87691f95958688f6813e Mon Sep 17 00:00:00 2001 From: bunsenstraat Date: Mon, 22 Nov 2021 12:13:12 +0100 Subject: [PATCH] fix test --- .../src/tests/solidityUnittests.test.ts | 4 ++- apps/remix-ide/ci/browser_test.sh | 2 +- apps/remix-ide/ci/browser_tests_firefox.sh | 27 ------------------- package-lock.json | 8 +++--- 4 files changed, 8 insertions(+), 33 deletions(-) delete mode 100755 apps/remix-ide/ci/browser_tests_firefox.sh diff --git a/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts b/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts index a4c0b981f9..f6ccce0509 100644 --- a/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts +++ b/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts @@ -324,10 +324,12 @@ module.exports = { .removeFile('tests/ballotFailedDebug_test.sol', 'workspace_new') }, - 'Basic Solidity Unit tests with local compiler #group5': !function (browser: NightwatchBrowser) { + 'Basic Solidity Unit tests with local compiler #group6': function (browser: NightwatchBrowser) { browser .clickLaunchIcon('solidity') .setSolidityCompilerVersion('builtin') + .clickLaunchIcon('filePanel') + .click('*[data-id="treeViewLitreeViewItemcontracts"]') .openFile('contracts/3_Ballot.sol') .clickLaunchIcon('pluginManager') .scrollAndClick('[data-id="pluginManagerComponentDeactivateButtonsolidityUnitTesting"]') diff --git a/apps/remix-ide/ci/browser_test.sh b/apps/remix-ide/ci/browser_test.sh index 00a4158c86..38ccf69bb2 100755 --- a/apps/remix-ide/ci/browser_test.sh +++ b/apps/remix-ide/ci/browser_test.sh @@ -7,7 +7,7 @@ echo "$BUILD_ID" TEST_EXITCODE=0 npm run ganache-cli & -npm run serve:production & +npm run serve & echo 'sharing folder: ' $PWD '/apps/remix-ide/contracts' & npm run remixd & diff --git a/apps/remix-ide/ci/browser_tests_firefox.sh b/apps/remix-ide/ci/browser_tests_firefox.sh deleted file mode 100755 index 1fd7616b6a..0000000000 --- a/apps/remix-ide/ci/browser_tests_firefox.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -set -e - -BUILD_ID=${CIRCLE_BUILD_NUM:-${TRAVIS_JOB_NUMBER}} -echo "$BUILD_ID" -TEST_EXITCODE=0 - -npm run ganache-cli & -npm run serve:production & -echo 'sharing folder: ' $PWD '/apps/remix-ide/contracts' & -npm run remixd & - -sleep 5 - -npm run build:e2e - -TESTFILES=$(grep -IRiL "disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "\.spec\|\.test" | sort | circleci tests split ) -for TESTFILE in $TESTFILES; do - npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js $TESTFILE --env=firefox || TEST_EXITCODE=1 -done - -echo "$TEST_EXITCODE" -if [ "$TEST_EXITCODE" -eq 1 ] -then - exit 1 -fi diff --git a/package-lock.json b/package-lock.json index a4003273e9..c2d8572ea6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40142,9 +40142,9 @@ } }, "got": { - "version": "11.8.2", - "resolved": "https://registry.npmjs.org/got/-/got-11.8.2.tgz", - "integrity": "sha512-D0QywKgIe30ODs+fm8wMZiAcZjypcCodPNuMz5H9Mny7RJ+IjJ10BdmGW7OM7fHXP+O7r6ZwapQ/YQmMSvB0UQ==", + "version": "11.8.3", + "resolved": "https://registry.npmjs.org/got/-/got-11.8.3.tgz", + "integrity": "sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg==", "dev": true, "requires": { "@sindresorhus/is": "^4.0.0", @@ -40152,7 +40152,7 @@ "@types/cacheable-request": "^6.0.1", "@types/responselike": "^1.0.0", "cacheable-lookup": "^5.0.3", - "cacheable-request": "^7.0.1", + "cacheable-request": "^7.0.2", "decompress-response": "^6.0.0", "http2-wrapper": "^1.0.0-beta.5.2", "lowercase-keys": "^2.0.0",