diff --git a/.eslintignore b/.eslintignore index 0d60b8df1..0022114ea 100644 --- a/.eslintignore +++ b/.eslintignore @@ -8,6 +8,7 @@ gulpfile.js /tests/compile/* /tests/jsunit/* /tests/generators/* +/tests/mocha/run_mocha_tests_in_browser.js /tests/test_runner.js /tests/workspace_svg/* /generators/* diff --git a/tests/mocha/index.html b/tests/mocha/index.html index b177d8cfa..f65647865 100644 --- a/tests/mocha/index.html +++ b/tests/mocha/index.html @@ -10,6 +10,7 @@
+ @@ -34,7 +35,10 @@ diff --git a/tests/mocha/run_mocha_tests_in_browser.js b/tests/mocha/run_mocha_tests_in_browser.js new file mode 100644 index 000000000..72b521505 --- /dev/null +++ b/tests/mocha/run_mocha_tests_in_browser.js @@ -0,0 +1,81 @@ +/** + * @license + * Visual Blocks Editor + * + * Copyright 2018 Google Inc. + * https://developers.google.com/blockly/ + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @fileoverview Node.js script to run JsUnit tests in Chrome, via webdriver. + */ +var webdriverio = require('webdriverio'); + +module.exports = runMochaTestsInBrowser; + +/** + * Runs the Mocha tests in this directory in Chrome. It uses webdriverio to + * launch Chrome and load index.html. Outputs a summary of the test results + * to the console. + * @return 0 on success, 1 on failure. + */ +async function runMochaTestsInBrowser() { + var options = { + capabilities: { + browserName: 'chrome' + } + }; + + var url = 'file://' + __dirname + '/index.html'; + console.log('Starting webdriverio...'); + const browser = await webdriverio.remote(options); + console.log('Initialized.\nLoading url: ' + url); + await browser.url(url); + + await browser.waitUntil(async () => { + var elem = await browser.$('#failureCount'); + var text = await elem.getAttribute('tests_failed'); + return text != 'unset'; + }) + + const elem = await browser.$('#failureCount') + const numOfFailure = await elem.getAttribute('tests_failed'); + + console.log('============Blockly Mocha Test Summary================='); + console.log(numOfFailure); + console.log(numOfFailure + ' tests failed'); + console.log('============Blockly Mocha Test Summary================='); + if (parseInt(numOfFailure) !== 0) { + await browser.deleteSession(); + return 1; + } + await browser.deleteSession(); + return 0; +} + +if (require.main === module) { + runMochaTestsInBrowser().catch(e => { + console.error(e); + process.exit(1); + }).then(function(result) { + if (result) { + console.log('Mocha tests failed'); + process.exit(1); + } else { + console.log('Mocha tests passed'); + process.exit(0); + } + }); +} diff --git a/tests/run_all_tests.sh b/tests/run_all_tests.sh index f63646fb6..f0d4695d7 100755 --- a/tests/run_all_tests.sh +++ b/tests/run_all_tests.sh @@ -57,7 +57,9 @@ run_test_command "eslint" "eslint ." # Run JSUnit tests inside a browser. run_test_command "jsunit" "node tests/jsunit/run_jsunit_tests_in_browser.js" -# TODO: Make sure jsunit output is captured. Child process? + +# Run Mocha tests inside a browser. +run_test_command "mocha" "node tests/mocha/run_mocha_tests_in_browser.js" # Run generator tests inside a browser and check the results. run_test_command "generators" "tests/scripts/run_generators.sh"