Merge branch 'master' into jhefferman/dedupe-coverage-scope-token-fix

Author: jhefferman-sfdc

packages/@lwc/integration-karma/test/component/LightningElement.attachInternals/api/index.spec.js

@@ -39,7 +39,7 @@ const attachInternalsSanityTest = (tagName, ctor) => {
         });
 
         afterAll(() => {
-            document.body.removeChild(elm);
+            elm.remove();
         });
 
         it('should be able to create ElementInternals object', () => {

packages/@lwc/integration-karma/test/events/focus-event-related-target/index.spec.js

@@ -6,6 +6,7 @@ import Container from 'x/container';
 // So this test may "flap" during local development if your browser window isn't focused (e.g. you're focused on
 // the DevTools instead).
 it('should retarget relatedTarget', function () {
+    expect(document.hasFocus(), 'Browser window must be focused for test to work').toBe(true);
     const elm = createElement('x-container', { is: Container });
     document.body.appendChild(elm);
 

packages/@lwc/integration-karma/test/light-dom/slot-fowarding/scoped-slots/index.spec.js

@@ -10,7 +10,7 @@ describe('scoped slots, slot forwarding', () => {
     });
 
     afterAll(() => {
-        document.body.removeChild(lightContainer);
+        lightContainer.remove();
     });
 
     // TODO [#3889]: This test should be updated once a fix is ready.

packages/@lwc/integration-karma/test/light-dom/slot-fowarding/slots/forwarding/index.spec.js

@@ -57,7 +57,7 @@ describe('slot forwarding', () => {
     });
 
     afterAll(() => {
-        document.body.removeChild(lightContainer);
+        lightContainer.remove();
     });
 
     it('should correctly forward slot assignments - light > light slot', () => {

packages/@lwc/integration-karma/test/light-dom/slot-fowarding/slots/reactivity/index.spec.js

@@ -7,14 +7,14 @@ describe('light DOM slot forwarding reactivity', () => {
     let nodes;
     let lightContainer;
 
-    beforeAll(() => {
+    beforeEach(() => {
         lightContainer = createElement('x-light-container', { is: LightContainer });
         document.body.appendChild(lightContainer);
         nodes = extractDataIds(lightContainer);
     });
 
-    afterAll(() => {
-        document.body.removeChild(lightContainer);
+    afterEach(() => {
+        lightContainer.remove();
     });
 
     const verifySlotContent = (leaf, expected) => {

packages/@lwc/integration-karma/test/profiler/mutation-logging/index.spec.js

@@ -4,7 +4,8 @@ import Child from 'x/child';
 import GetterThrows from 'x/getterThrows';
 
 const arr = jasmine.arrayWithExactContents;
-const obj = jasmine.objectContaining;
+// `jasmine.objectContaining` is long, but the method can't be detached/aliased, ergo wrapper
+const obj = (val) => jasmine.objectContaining(val);
 
 let entries = [];
 

packages/@lwc/integration-karma/test/regression/invalid-key/index.spec.js

@@ -15,13 +15,12 @@ it('W-15885661 - renders list when key is invalid (preserve backwards compat)',
     elm.items = [{ value: 1 }];
     await Promise.resolve();
 
-    const {
-        calls: { error },
-    } = spy;
-    expect(error.length).toBe(process.env.NODE_ENV === 'production' ? 0 : 2);
-    error.forEach((error) =>
-        expect(error).toMatch(/(Invalid key value.*|Invalid "key" attribute.*)/)
-    );
+    const errorCalls = spy.calls.error;
+    expect(errorCalls.length).toBe(process.env.NODE_ENV === 'production' ? 0 : 2);
+    errorCalls.forEach(([error]) => {
+        expect(error).toBeInstanceOf(Error);
+        expect(error.message).toMatch(/(Invalid key value.*|Invalid "key" attribute.*)/);
+    });
 
     spy.reset();
 

packages/@lwc/integration-karma/test/rendering/sanitize-stylesheet-token/index.spec.js

@@ -89,7 +89,8 @@ props.forEach((prop) => {
                         } else {
                             // dev mode
                             expect(logger).toHaveBeenCalledTimes(1);
-                            expect(logger.calls.allArgs()[0]).toMatch(
+                            const loggedError = logger.calls.allArgs()[0][0];
+                            expect(loggedError.message).toMatch(
                                 new RegExp(
                                     `Mutating the "${prop}" property on a template is deprecated`
                                 )

packages/@lwc/integration-karma/test/static-content/index.spec.js

@@ -819,7 +819,7 @@ describe('text containing comments', () => {
         describe(`preserveComments ${preserveComments}`, () => {
             let elm;
             let nodes;
-            beforeAll(async () => {
+            beforeEach(async () => {
                 elm = createElement(tagName, {
                     is: ctor,
                 });
@@ -829,7 +829,7 @@ describe('text containing comments', () => {
             });
 
             afterAll(() => {
-                document.body.removeChild(elm);
+                elm.remove();
             });
 
             const assertChildNodesInnerHTMLMatches = (actual, expected) => {

packages/@lwc/integration-karma/test/template/directive-for-each/index.spec.js

@@ -96,8 +96,10 @@ describe('null/undefined values', () => {
                 expect(spy.calls.error.length).toBe(0);
             } else {
                 expect(spy.calls.error.length).toBe(1);
+                const err = spy.calls.error[0][0]; // first arg of first call
+                expect(err).toBeInstanceOf(Error);
                 // TODO [#1283]: Improve this error message. The vm should not be exposed and the message is not helpful.
-                expect(spy.calls.error[0]).toMatch(/It must be an array-like object/);
+                expect(err.message).toMatch(/It must be an array-like object/);
             }
         });
     });