Merge branch 'main' into 3.99

spec/core/EnvSpec.js

@@ -192,6 +192,31 @@ describe('Env', function() {
     );
   });
 
+  it('ignores configuration properties that are present but undefined', function() {
+    var initialConfig = {
+      random: true,
+      seed: '123',
+      failFast: true,
+      failSpecWithNoExpectations: true,
+      oneFailurePerSpec: true,
+      hideDisabled: true
+    };
+    env.configure(initialConfig);
+
+    env.configure({
+      random: undefined,
+      seed: undefined,
+      failFast: undefined,
+      failSpecWithNoExpectations: undefined,
+      oneFailurePerSpec: undefined,
+      hideDisabled: undefined
+    });
+
+    expect(env.configuration()).toEqual(
+      jasmine.objectContaining(initialConfig)
+    );
+  });
+
   describe('promise library', function() {
     it('can be configured without a custom library', function() {
       env.configure({});

spec/npmPackage/npmPackageSpec.js

@@ -75,7 +75,7 @@ describe('npm package', function() {
   });
 
   it('has bootFiles', function() {
-    expect(this.packagedCore.files.bootFiles).toEqual(['boot.js']);
+    expect(this.packagedCore.files.bootFiles).toEqual(['boot0.js', 'boot1.js']);
     expect(this.packagedCore.files.nodeBootFiles).toEqual(['node_boot.js']);
 
     var packagedCore = this.packagedCore;
@@ -83,6 +83,10 @@ describe('npm package', function() {
       expect(fileName).toExistInPath(packagedCore.files.bootDir);
     });
 
+    // For backwards compatibility, boot.js should be packaged even though
+    // it is no longer in bootFiles.
+    expect('boot.js').toExistInPath(packagedCore.files.bootDir);
+
     var packagedCore = this.packagedCore;
     this.packagedCore.files.nodeBootFiles.forEach(function(fileName) {
       expect(fileName).toExistInPath(packagedCore.files.bootDir);