Use jasmine-browser-runner to execute browser tests

.travis.yml

@@ -1,8 +1,8 @@
 language: node_js
 node_js:
-  - "12"
-  - "10"
   - "8"
+  - "10"
+  - "12"
 
 script: $TEST_COMMAND
 

ci.js

@@ -1,188 +0,0 @@
-const path = require("path"),
-      fs = require('fs'),
-      jasmineBrowser = require('jasmine-browser-runner'),
-      jasmineCore = require('./lib/jasmine-core.js'),
-      colors = {
-        "passed" : "\x1B[32m",
-        "failed": "\x1B[31m",
-        "pending": "\x1B[33m",
-        "excluded": "\x1B[0m",
-        "none": "\x1B[0m"
-      },
-      symbols = {
-        "passed" : ".",
-        "failed": "F",
-        "pending": "*",
-        "excluded": "",
-        "none": ""
-      },
-      useSauce = process.env.USE_SAUCE === 'true';
-
-var config = require(path.resolve('spec/support/jasmine-browser.json'));
-config.jasmineCore = jasmineCore;
-config.port = 0;
-
-let driver, server;
-
-function buildWebdriver() {
-  const webdriver = require("selenium-webdriver"),
-    Capability = webdriver.Capability;
-  if (useSauce) {
-    const username = process.env['SAUCE_USERNAME'],
-      accessKey = process.env['SAUCE_ACCESS_KEY'];
-    return new webdriver.Builder()
-      .withCapabilities({
-        name: `jasmine-core ${new Date().toISOString()}`,
-        [Capability.PLATFORM]: process.env['SAUCE_OS'],
-        [Capability.BROWSER_NAME]: process.env['JASMINE_BROWSER'],
-        [Capability.VERSION]: process.env['SAUCE_BROWSER_VERSION'],
-        build: `Core ${process.env['TRAVIS_BUILD_NUMBER'] || 'Ran locally'}`,
-        tags: ['Jasmine-Core'],
-        "tunnel-identifier": process.env['TRAVIS_JOB_NUMBER'] ? process.env['TRAVIS_JOB_NUMBER'].toString() : null
-      })
-      .usingServer(`http://${username}:${accessKey}@localhost:4445/wd/hub`)
-      .build();
-  } else {
-    return new webdriver.Builder()
-      .forBrowser(process.env["JASMINE_BROWSER"] || "firefox")
-      .build();
-  }
-}
-
-async function resultsWithoutCircularReferences(driver, resultType, index, batchSize) {
-  return await driver.executeScript(
-    `var results = jsApiReporter.${resultType}Results(${index}, ${batchSize});\n` +
-    'for (var i = 0; i < results.length; i++) {\n' +
-      'var expectations = results[i].failedExpectations;\n' +
-      'if (results[i].passedExpectations) {\n' +
-        'expectations = expectations.concat(results[i].passedExpectations);\n' +
-      '}\n' +
-      'for (var j = 0; j < expectations.length; j++) {\n' +
-        'var expectation = expectations[j];\n' +
-        "try { JSON.stringify(expectation.expected); } catch (e) { expectation.expected = '<circular expected>'; }\n" +
-        "try { JSON.stringify(expectation.actual); } catch (e) { expectation.actual = '<circular actual>'; }\n" +
-      '}\n' +
-    '}\n' +
-    'return results;'
-  );
-}
-
-function flatten(arr) {
-  return Array.prototype.concat.apply([], arr);
-}
-
-async function getResults(driver) {
-  const batchSize = 50,
-    specResults = [],
-    failedSuiteResults = [];
-  let index = 0,
-    slice = [];
-
-  do {
-    slice = await resultsWithoutCircularReferences(driver, 'spec', index, batchSize);
-    specResults.push(slice);
-    index += batchSize;
-  } while (slice.length === batchSize);
-
-  index = 0;
-  do {
-    slice = await resultsWithoutCircularReferences(driver, 'suite', index, batchSize);
-    failedSuiteResults.push(slice.filter(function(suite) { return suite.status === 'failed' }));
-    index += batchSize;
-  } while (slice.length === batchSize);
-
-  return {specResults: flatten(specResults), failedSuiteResults: flatten(failedSuiteResults)};
-}
-
-function cleanup() {
-  return Promise.all([
-    driver ? driver.close() : true,
-    new Promise(resolve => server ? server.close(resolve) : resolve())
-  ]).catch(error => {
-    console.error(error);
-  });
-}
-
-(async function () {
-  server = await jasmineBrowser.startServer(config);
-  const host = `http://localhost:${server.address().port}`;
-
-  console.log("Running the tests in browser...");
-  driver = buildWebdriver();
-  await driver.get(`${host}/?throwFailures=false&failFast=false&random=true`)
-  await new Promise(resolve => {
-    const intervalId = setInterval(async () => {
-      const isFinished = await driver.executeScript("return jsApiReporter && jsApiReporter.finished")
-      if (isFinished) {
-        clearInterval(intervalId)
-        resolve();
-      }
-    }, 500)
-  });
-
-  const {specResults, failedSuiteResults} = await getResults(driver);
-  console.log(specResults.map(spec => `${colors[spec.status]}${symbols[spec.status]}`).join("") + colors["none"]);
-
-  const result = specResults.reduce((result, spec) => {
-    result[spec.status] = [...result[spec.status], spec];
-    return result;
-  }, {pending: [], failed: [], passed: [], excluded: []});
-
-  if (result.pending.length) {
-    console.log(`${colors["pending"]}Pending:`);
-    result.pending.forEach((spec, index) => {
-      console.log(`${colors["none"]}${index}) ${spec.fullName}`)
-      console.group();
-      console.log(`${colors["pending"]}${spec.pendingReason || "no reason given"}`);
-      console.groupEnd();
-      console.log();
-    });
-  }
-
-  if (result.failed.length) {
-    console.log(`${colors["failed"]}Failed:`);
-    result["failed"].forEach((spec, index) => {
-      console.log(`${colors["none"]}${index}) ${spec.fullName}`)
-      console.group();
-      spec.failedExpectations.forEach((expect) => {
-        console.log(`${colors["none"]}Message:`);
-        console.group();
-        console.log(`${colors["failed"]}${expect.message}`);
-        console.groupEnd();
-        console.log(`${colors["none"]}Stack:`);
-        console.group();
-        console.log(`${colors["failed"]}${expect.stack}`);
-        console.groupEnd();
-        console.groupEnd();
-      })
-      console.groupEnd();
-      console.log();
-    });
-  }
-
-  const details = await driver.executeScript(`
-      return {
-        overallStatus: jsApiReporter.runDetails.overallStatus,
-        overallFailures: jsApiReporter.runDetails.failedExpectations,
-        executionTime: jsApiReporter.executionTime(),
-        random: jsApiReporter.runDetails.order.random,
-        seed: jsApiReporter.runDetails.order.seed
-      }`);
-
-  console.log(`${colors["none"]}${specResults.length} spec(s), ${result.failed.length} failure(s), ${result.pending.length} pending spec(s)`);
-  console.log(`Finished in ${details.executionTime / 1000} second(s)`);
-  console.log(`Randomized with seed ${details.seed} ( ${host}/?random=${details.random}&seed=${details.seed} )`);
-  process.exitCode = details.overallStatus === 'passed' ? 0 : 1;
-
-  // Print details of global errors encountered during the test run. (Most likely,
-  // some type of file loading or syntax error.)
-  if (details.overallFailures && details.overallFailures.length > 0) {
-    console.error('Failures encountered during test run:', JSON.stringify(details.overallFailures, undefined, 2));
-  }
-
-  if (useSauce) {
-    driver.executeScript(`sauce:job-result=${process.exitCode === 0}`);
-  }
-})().catch(error => {
-  console.error(error);
-}).then(cleanup);

package.json

@@ -16,7 +16,9 @@
     "posttest": "eslint src/**/*.js spec/**/*.js && prettier --check src/**/*.js spec/**/*.js",
     "test": "grunt execSpecsInNode",
     "cleanup": "prettier --write src/**/*.js spec/**/*.js",
-    "serve": "node spec/support/localJasmineBrowser.js"
+    "serve": "node spec/support/localJasmineBrowser.js",
+    "serve:performance": "node spec/support/localJasmineBrowser.js jasmine-browser-performance.json",
+    "ci": "node spec/support/ci.js"
   },
   "description": "Official packaging of Jasmine's core files for use by Node.js projects.",
   "homepage": "https://jasmine.github.io",
@@ -33,7 +35,7 @@
     "grunt-css-url-embed": "^1.11.1",
     "grunt-sass": "^3.0.2",
     "jasmine": "^3.4.0",
-    "jasmine-browser-runner": "0.0.2",
+    "jasmine-browser-runner": "^0.1.0",
     "jsdom": "^15.0.0",
     "load-grunt-tasks": "^4.0.0",
     "node-sass": "^4.11.0",

spec/support/ci.js

@@ -0,0 +1,48 @@
+const path = require("path"),
+      fs = require('fs'),
+      util = require('util'),
+      jasmineBrowser = require('jasmine-browser-runner'),
+      ConsoleReporter = require('jasmine').ConsoleReporter,
+      jasmineCore = require('../../lib/jasmine-core'),
+      useSauce = process.env.USE_SAUCE === 'true';
+
+var config = require(path.resolve('spec/support/jasmine-browser.json'));
+config.jasmineCore = jasmineCore;
+
+function buildWebdriver() {
+  const webdriver = require("selenium-webdriver"),
+    Capability = webdriver.Capability;
+  if (useSauce) {
+    const username = process.env['SAUCE_USERNAME'],
+      accessKey = process.env['SAUCE_ACCESS_KEY'];
+    return new webdriver.Builder()
+      .withCapabilities({
+        name: `jasmine-core ${new Date().toISOString()}`,
+        [Capability.PLATFORM]: process.env['SAUCE_OS'],
+        [Capability.BROWSER_NAME]: process.env['JASMINE_BROWSER'],
+        [Capability.VERSION]: process.env['SAUCE_BROWSER_VERSION'],
+        build: `Core ${process.env['TRAVIS_BUILD_NUMBER'] || 'Ran locally'}`,
+        tags: ['Jasmine-Core'],
+        "tunnel-identifier": process.env['TRAVIS_JOB_NUMBER'] ? process.env['TRAVIS_JOB_NUMBER'].toString() : null
+      })
+      .usingServer(`http://${username}:${accessKey}@localhost:4445/wd/hub`)
+      .build();
+  } else {
+    return new webdriver.Builder()
+      .forBrowser(process.env["JASMINE_BROWSER"] || "firefox")
+      .build();
+  }
+}
+
+const driver = buildWebdriver();
+jasmineBrowser.runSpecs(config, driver).then(function(runDetails) {
+  process.exitCode = runDetails.overallStatus === 'passed' ? 0 : 1;
+
+  if (useSauce) {
+    driver.executeScript(`sauce:job-result=${process.exitCode === 0}`);
+  }
+}).catch(error => {
+  console.error(error);
+}).then(function () {
+  return driver ? driver.close() : true;
+});

spec/support/jasmine-browser-performance.json

@@ -0,0 +1,11 @@
+{
+  "srcDir": "src",
+  "specDir": "spec",
+  "specFiles": [
+    "performance/performance_test.js"
+  ],
+  "helpers": [
+    "helpers/defineJasmineUnderTest.js"
+  ],
+  "random": true
+}

spec/support/localJasmineBrowser.js

@@ -2,7 +2,10 @@ var path = require('path'),
   jasmineBrowser = require('jasmine-browser-runner'),
   jasmineCore = require('../../lib/jasmine-core.js');
 
-var config = require(path.resolve('spec/support/jasmine-browser.json'));
+var configFile = process.argv[2] || 'jasmine-browser.json';
+
+var config = require(path.resolve('spec/support', configFile));
 config.jasmineCore = jasmineCore;
+config.batchReporter = true;
 
 jasmineBrowser.startServer(config);

travis-core-script.sh

@@ -9,4 +9,4 @@ then
   fi
 fi
 
-node ci.js
+npm run ci