jasmine-browser-runner 0.9.0 → 0.10.0

package/README.md

@@ -8,13 +8,13 @@ using either headless Chrome or Saucelabs.
 # Getting started
 
 ```bash
-npm install --save-dev jasmine-browser-runner
+npm install --save-dev jasmine-browser-runner jasmine-core
 ```
 
 or
 
 ```bash
-yarn add -D jasmine-browser-runner
+yarn add -D jasmine-browser-runner jasmine-core
 ```
 
 Add a `spec/support/jasmine-browser.json`. For example:
@@ -73,6 +73,11 @@ modules. ES modules will silently fail to load in browsers that don't
 support them. Other kinds of load-time errors are detected and reported as suite
 errors.
 
+To allow spec files to import source files via relative paths, set the `specDir`
+config field to something that's high enough up to include both spec and source
+files, and set `srcFiles` to `[]`. You can autogenerate such a configuration by
+running `npx jasmine-browser-runner init --esm`.
+
 ## Use with Rails
 
 You can use jasmine-browser-runner to test your Rails application's JavaScript,

package/bin/jasmine-browser-runner

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 var path = require('path'),
-  jasmineCore = require('jasmine-core'),
+  jasmineCore = require('../lib/jasmineCore'),
   Command = require('../lib/command'),
   jasmineBrowser = require('../index.js');
 

package/lib/command.js

@@ -1,6 +1,11 @@
 const path = require('path');
 const fs = require('fs');
-const { loadConfig, validateConfig, defaultConfig } = require('./config');
+const {
+  loadConfig,
+  validateConfig,
+  defaultConfig,
+  defaultEsmConfig,
+} = require('./config');
 
 const commonOptions = [
   { name: 'config', type: 'string', description: 'path to the config file' },
@@ -17,6 +22,14 @@ const subCommands = [
   {
     name: 'init',
     description: 'initialize a new Jasmine project',
+    options: [
+      {
+        name: 'esm',
+        type: 'bool',
+        description:
+          'configure for use with ES modules (<script type="module">)',
+      },
+    ],
   },
   {
     name: 'serve',
@@ -133,7 +146,7 @@ class Command {
     this._logger.log('jasmine-core v' + this._config.jasmineCore.version());
   }
 
-  init() {
+  init(options) {
     const dest = 'spec/support/jasmine-browser.json';
 
     if (fs.existsSync(dest)) {
@@ -142,7 +155,13 @@ class Command {
     }
 
     fs.mkdirSync(path.dirname(dest), { recursive: true });
-    fs.writeFileSync(dest, defaultConfig());
+
+    if (options.esm) {
+      fs.writeFileSync(dest, defaultEsmConfig());
+    } else {
+      fs.writeFileSync(dest, defaultConfig());
+    }
+
     this._logger.log(`Wrote configuration to ${dest}.`);
   }
 

package/lib/config.js

@@ -58,4 +58,18 @@ function defaultConfig() {
   });
 }
 
-module.exports = { loadConfig, validateConfig, defaultConfig };
+function defaultEsmConfig() {
+  return fs.readFileSync(
+    require.resolve('./examples/default_esm_config.json'),
+    {
+      encoding: 'utf8',
+    }
+  );
+}
+
+module.exports = {
+  loadConfig,
+  validateConfig,
+  defaultConfig,
+  defaultEsmConfig,
+};

package/lib/examples/default_config.json

@@ -1,14 +1,14 @@
 {
   "srcDir": "src",
   "srcFiles": [
-    "**/*.?(m)js"
+    "**/*.js"
   ],
   "specDir": "spec",
   "specFiles": [
-    "**/*[sS]pec.?(m)js"
+    "**/*[sS]pec.js"
   ],
   "helpers": [
-    "helpers/**/*.?(m)js"
+    "helpers/**/*.js"
   ],
   "env": {
     "stopSpecOnExpectationFailure": false,

package/lib/examples/default_esm_config.json

@@ -0,0 +1,19 @@
+{
+  "srcDir": "src",
+  "srcFiles": [],
+  "specDir": ".",
+  "specFiles": [
+    "spec/**/*[sS]pec.?(m)js"
+  ],
+  "helpers": [
+    "spec/helpers/**/*.?(m)js"
+  ],
+  "env": {
+    "stopSpecOnExpectationFailure": false,
+    "stopOnSpecFailure": false,
+    "random": true
+  },
+  "browser": {
+    "name": "firefox"
+  }
+}

package/lib/jasmineCore.js

@@ -0,0 +1,11 @@
+try {
+  module.exports = require('jasmine-core');
+} catch (e) {
+  if (e.code === 'MODULE_NOT_FOUND') {
+    throw new Error(
+      "Could not load jasmine-core. Please make sure that it's installed."
+    );
+  } else {
+    throw e;
+  }
+}

package/lib/server.js

@@ -20,7 +20,7 @@ class Server {
     this.batchReporter = options.batchReporter || false;
     this.jsonDomReporter = options.jsonDomReporter || false;
     this.projectBaseDir = options.projectBaseDir || path.resolve();
-    this.jasmineCore = options.jasmineCore || require('jasmine-core');
+    this.jasmineCore = options.jasmineCore || require('./jasmineCore');
     this.jasmineCssFiles = this.jasmineCore.files.cssFiles.map(function(
       fileName
     ) {
@@ -53,7 +53,7 @@ class Server {
   getUrls(baseDir, globs, urlRoot) {
     return findFiles(path.join(this.projectBaseDir, baseDir), globs || []).map(
       function(p) {
-        return unWindows(path.join(urlRoot, p));
+        return isUrl(p) ? p : unWindows(path.join(urlRoot, p));
       }
     );
   }
@@ -221,6 +221,10 @@ function findPort(serverPort, optionsPort) {
   return 8888;
 }
 
+function isUrl(s) {
+  return s.startsWith('http://') || s.startsWith('https://');
+}
+
 function findFiles(baseDir, globs) {
   const { includeGlobs, excludeGlobs } = globs.reduce(
     function(ongoing, g) {
@@ -241,12 +245,16 @@ function findFiles(baseDir, globs) {
   const result = [];
 
   for (const g of includeGlobs) {
-    const files = glob.sync(g, { ignore: excludeGlobs, cwd: baseDir });
+    if (isUrl(g)) {
+      result.push(g);
+    } else {
+      const files = glob.sync(g, { ignore: excludeGlobs, cwd: baseDir });
 
-    for (const f of files) {
-      // De-duplicate
-      if (result.indexOf(f) === -1) {
-        result.push(f);
+      for (const f of files) {
+        // De-duplicate
+        if (result.indexOf(f) === -1) {
+          result.push(f);
+        }
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jasmine-browser-runner",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "Serve and run your Jasmine specs in a browser",
   "bin": "bin/jasmine-browser-runner",
   "exports": "./index.js",
@@ -13,7 +13,8 @@
     "run.html.ejs",
     "bin/*.js",
     "lib/**/*.js",
-    "lib/examples/default_config.json"
+    "lib/examples/default_config.json",
+    "lib/examples/default_esm_config.json"
   ],
   "scripts": {
     "posttest": "eslint bin/* lib spec scripts index.js --ignore-path=.styleIgnore && prettier --check --ignore-path=.styleIgnore lib/*.js lib/**/*.js spec/**/*.js scripts/*.js index.js",
@@ -40,17 +41,17 @@
   },
   "homepage": "https://github.com/jasmine/jasmine-browser-runner#readme",
   "dependencies": {
-    "ejs": "^2.6.1",
+    "ejs": "^3.1.6",
     "express": "^4.16.4",
     "glob": "^7.1.7",
-    "selenium-webdriver": "^4.0.0-beta.4"
+    "selenium-webdriver": "^4.1.0"
   },
   "peerDependencies": {
     "jasmine-core": "^3.9.0"
   },
   "devDependencies": {
-    "eslint": "^6.8.0",
-    "eslint-plugin-jasmine": "^2.10.1",
+    "eslint": "^8.3.0",
+    "eslint-plugin-jasmine": "^4.1.3",
     "jasmine": "^3.9.0",
     "jasmine-core": "^3.9.0",
     "prettier": "^1.17.1",

package/run.html.ejs

@@ -8,6 +8,8 @@
   <% cssFiles.forEach(function(cssFile) { %>
     <link rel="stylesheet" href="<%= cssFile %>" type="text/css" media="screen"/>
   <% }) %>
+</head>
+<body>
   <% jasmineJsFiles.forEach(function(jsFile) { %>
     <script src="<%= jsFile %>" type="text/javascript"></script>
   <% }) %>
@@ -19,8 +21,6 @@
     <% } %>
   <% }) %>
 
-</head>
-<body>
 <div id="jasmine_content"></div>
 </body>
 </html>