Gruntfile.js

@@ -33,6 +33,4 @@ module.exports = function(grunt) {
 
     runCommands(commands, done);
   });
-
-  grunt.loadTasks('tasks');
 };

lib/jasmine.js

@@ -216,6 +216,12 @@ Jasmine.prototype.loadRequires = function() {
   // TODO: In 4.0, switch to calling _loadFiles
   // (requires making this function async)
   this.requires.forEach(function(r) {
+    if (r.startsWith('./') || r.startsWith("../")) {
+      console.warn('DEPRECATION: requires with relative paths (in this case ' +
+        `${r}) are currently resolved relative to the jasmine/lib/jasmine ` +
+        'module but will be relative to the current working directory in ' +
+        'Jasmine 4.0.');
+    }
     require(r);
   });
 };
@@ -294,6 +300,10 @@ Jasmine.prototype.loadConfig = function(config) {
     envConfig.random = config.random;
   }
 
+  if (config.verboseDeprecations !== undefined) {
+    envConfig.verboseDeprecations = config.verboseDeprecations;
+  }
+
 
   /**
    * Specifies how to load files with names ending in .js. Valid values are
@@ -326,7 +336,7 @@ Jasmine.prototype.loadConfig = function(config) {
    * @type string[] | undefined
    */
   if(config.helpers) {
-    this.addHelperFiles(config.helpers);
+    this.addMatchingHelperFiles(config.helpers);
   }
 
   /**
@@ -346,7 +356,7 @@ Jasmine.prototype.loadConfig = function(config) {
    * @type string[] | undefined
    */
   if(config.spec_files) {
-    this.addSpecFiles(config.spec_files);
+    this.addMatchingSpecFiles(config.spec_files);
   }
 };
 
@@ -382,7 +392,12 @@ Jasmine.prototype.addMatchingHelperFiles = addFiles('helperFiles');
  * {@link Jasmine#loadConfig|loadConfig}, or {@link Jasmine#loadConfigFile|loadConfigFile}
  * instead.
  */
-Jasmine.prototype.addSpecFiles = Jasmine.prototype.addMatchingSpecFiles;
+Jasmine.prototype.addSpecFiles = function(globs) {
+  this.env.deprecated('jasmine#addSpecFiles is deprecated. Use ' +
+    'jasmine#addMatchingSpecFiles instead.');
+  this.addMatchingSpecFiles(globs);
+};
+
 /**
  * Synonym for {@link Jasmine#addMatchingHelperFiles}
  * @name Jasmine#addHelperFiles
@@ -391,7 +406,11 @@ Jasmine.prototype.addSpecFiles = Jasmine.prototype.addMatchingSpecFiles;
  * {@link Jasmine#loadConfig|loadConfig}, or {@link Jasmine#loadConfigFile|loadConfigFile}
  * instead.
  */
-Jasmine.prototype.addHelperFiles = Jasmine.prototype.addMatchingHelperFiles;
+Jasmine.prototype.addHelperFiles = function(globs) {
+  this.env.deprecated('jasmine#addHelperFiles is deprecated. Use ' +
+    'jasmine#addMatchingHelperFiles instead.');
+  this.addMatchingHelperFiles(globs);
+};
 
 Jasmine.prototype.addRequires = function(requires) {
   const jasmineRunner = this;
@@ -452,6 +471,11 @@ function addFiles(kind) {
  * @param {function} onCompleteCallback
  */
 Jasmine.prototype.onComplete = function(onCompleteCallback) {
+  this.env.deprecated(
+    'Jasmine#onComplete is deprecated. Instead of calling onComplete, set ' +
+    "the Jasmine instance's exitOnCompletion property to false and use the " +
+    'promise returned from the execute method.'
+  );
   this.completionReporter.onComplete(onCompleteCallback);
 };
 
@@ -554,7 +578,7 @@ Jasmine.prototype.execute = async function(files, filterString) {
   if (files && files.length > 0) {
     this.specDir = '';
     this.specFiles = [];
-    this.addSpecFiles(files);
+    this.addMatchingSpecFiles(files);
   }
 
   await this.loadSpecs();

package.json

@@ -10,7 +10,7 @@
     "bdd"
   ],
   "license": "MIT",
-  "version": "3.10.0",
+  "version": "3.99.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/jasmine/jasmine-npm"
@@ -28,7 +28,7 @@
   ],
   "dependencies": {
     "glob": "^7.1.6",
-    "jasmine-core": "~3.10.0"
+    "jasmine-core": "~3.99.0"
   },
   "bin": "./bin/jasmine.js",
   "main": "./lib/jasmine.js",

release_notes/3.10.0.md

@@ -41,6 +41,12 @@ for more information.
 
 * Test suite improvements
 
+## Supported environments
+
+The jasmine NPM package has been tested on Node 12, 14, and 16. See the
+[jasmine-core release notes](https://github.com/jasmine/jasmine/blob/main/release_notes/3.10.0.md)
+for supported browsers.
+
 ------
 
 _Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

release_notes/3.99.0.md

@@ -0,0 +1,10 @@
+# Jasmine NPM 3.99.0 Release Notes
+
+This release adds deprecation warnings for breaking changes that will be
+introduced in Jasmine 4.0. Please see the
+[migration guide](https://jasmine.github.io/tutorials/upgrading_to_Jasmine_4.0)
+for more information.
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

spec/jasmine_spec.js

@@ -56,15 +56,39 @@ describe('Jasmine', function() {
 
   describe('Methods that specify files via globs', function() {
     describe('#addSpecFiles', function() {
+      beforeEach(function() {
+        this.testJasmine.env.deprecated = jasmine.createSpy('env.deprecated');
+      });
+
       hasCommonFileGlobBehavior('addSpecFiles', 'specFiles');
+
+      it('issues a deprecation warning', function() {
+        this.testJasmine.addSpecFiles([]);
+        expect(this.testJasmine.env.deprecated).toHaveBeenCalledWith(
+          'jasmine#addSpecFiles is deprecated. Use ' +
+            'jasmine#addMatchingSpecFiles instead.'
+        );
+      });
     });
 
     describe('#addMatchingSpecFiles', function() {
       hasCommonFileGlobBehavior('addMatchingSpecFiles', 'specFiles');
     });
 
     describe('#addHelperFiles', function() {
+      beforeEach(function() {
+        this.testJasmine.env.deprecated = jasmine.createSpy('env.deprecated');
+      });
+
       hasCommonFileGlobBehavior('addHelperFiles', 'helperFiles');
+
+      it('issues a deprecation warning', function() {
+        this.testJasmine.addHelperFiles([]);
+        expect(this.testJasmine.env.deprecated).toHaveBeenCalledWith(
+          'jasmine#addHelperFiles is deprecated. Use ' +
+            'jasmine#addMatchingHelperFiles instead.'
+        );
+      });
     });
 
     describe('#addMatchingHelperFiles', function() {
@@ -297,6 +321,23 @@ describe('Jasmine', function() {
         });
       });
 
+      it('passes verboseDeprecations to jasmine-core when specified', function() {
+        this.configObject.verboseDeprecations = true;
+        this.fixtureJasmine.loadConfig(this.configObject);
+
+        expect(this.fixtureJasmine.env.configure).toHaveBeenCalledWith(
+          jasmine.objectContaining({verboseDeprecations: true})
+        );
+      });
+
+      it('does not pass verboseDeprecations to jasmine-core when not specified', function() {
+        this.configObject.random = true; // or set any other property
+        this.fixtureJasmine.loadConfig(this.configObject);
+
+        expect(this.fixtureJasmine.env.configure).toHaveBeenCalled();
+        expect(this.fixtureJasmine.env.configure.calls.argsFor(0)[0].verboseDeprecations)
+          .toBeUndefined();
+      });
       describe('with jsLoader: "require"', function () {
         it('tells the loader not to always import', async function() {
           this.configObject.jsLoader = 'require';
@@ -331,13 +372,41 @@ describe('Jasmine', function() {
       describe('with jsLoader undefined', function () {
         it('tells the loader not to always import', async function() {
           this.configObject.jsLoader = undefined;
-          
+
           this.fixtureJasmine.loadConfig(this.configObject);
           await this.fixtureJasmine.loadSpecs();
 
           expect(this.loader.load).toHaveBeenCalledWith(jasmine.any(String), false);
         });
       });
+
+      it('logs a deprecation when a require has a path beginning with ../', function() {
+        this.configObject.requires = ['../somefile.js'];
+        spyOn(console, 'warn');
+
+        this.fixtureJasmine.loadConfig(this.configObject);
+        expect(() => this.fixtureJasmine.loadRequires())
+          .toThrowError(/^Cannot find module '\.\.\/somefile.js'/);
+
+        expect(console.warn).toHaveBeenCalledWith('DEPRECATION: requires ' +
+          'with relative paths (in this case ../somefile.js) are currently ' +
+          'resolved relative to the jasmine/lib/jasmine module but will be ' +
+          'relative to the current working directory in Jasmine 4.0.');
+      });
+
+      it('logs a deprecation when a require has a path beginning with ./', function() {
+        this.configObject.requires = ['./somefile.js'];
+        spyOn(console, 'warn');
+
+        this.fixtureJasmine.loadConfig(this.configObject);
+        expect(() => this.fixtureJasmine.loadRequires())
+          .toThrowError(/^Cannot find module '\.\/somefile.js'/);
+
+        expect(console.warn).toHaveBeenCalledWith('DEPRECATION: requires ' +
+          'with relative paths (in this case ./somefile.js) are currently ' +
+          'resolved relative to the jasmine/lib/jasmine module but will be ' +
+          'relative to the current working directory in Jasmine 4.0.');
+      });
     });
 
     describe('from a file', function() {
@@ -411,9 +480,13 @@ describe('Jasmine', function() {
     it('stores an onComplete function', function() {
       const fakeOnCompleteCallback = function() {};
       spyOn(this.testJasmine.completionReporter, 'onComplete');
+      this.testJasmine.env.deprecated = jasmine.createSpy('env.deprecated');
 
       this.testJasmine.onComplete(fakeOnCompleteCallback);
       expect(this.testJasmine.completionReporter.onComplete).toHaveBeenCalledWith(fakeOnCompleteCallback);
+      expect(this.testJasmine.env.deprecated).toHaveBeenCalledWith(
+        "Jasmine#onComplete is deprecated. Instead of calling onComplete, set the Jasmine instance's exitOnCompletion property to false and use the promise returned from the execute method."
+      );
     });
   });
 
@@ -590,6 +663,10 @@ describe('Jasmine', function() {
       });
 
       describe('When #onComplete has been called', function() {
+        beforeEach(function() {
+          this.testJasmine.env.deprecated = function() {};
+        });
+
         it('calls the supplied completion handler with true when the whole suite is green', async function() {
           const completionHandler = jasmine.createSpy('completionHandler');
           this.testJasmine.onComplete(completionHandler);