From fe0afd6b5c2aa15c5a8e379f16b9a80add047d1b Mon Sep 17 00:00:00 2001
From: Pavel Feldman <pavel.feldman@gmail.com>
Date: Tue, 17 May 2022 14:44:12 -0700
Subject: [PATCH] fix(toHaveProperty): serialize falsy arguments as well
 (#14232)

---
 .../playwright-core/src/client/locator.ts     |  3 +-
 .../playwright.expect.misc.spec.ts            | 37 ++++++++++++++++---
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/packages/playwright-core/src/client/locator.ts b/packages/playwright-core/src/client/locator.ts
index 04ec6ca5f9..9d805b3cfa 100644
--- a/packages/playwright-core/src/client/locator.ts
+++ b/packages/playwright-core/src/client/locator.ts
@@ -276,8 +276,7 @@ export class Locator implements api.Locator {
   async _expect(customStackTrace: ParsedStackTrace, expression: string, options: Omit<FrameExpectOptions, 'expectedValue'> & { expectedValue?: any }): Promise<{ matches: boolean, received?: any, log?: string[] }> {
     return this._frame._wrapApiCall(async () => {
       const params: channels.FrameExpectParams = { selector: this._selector, expression, ...options, isNot: !!options.isNot };
-      if (options.expectedValue)
-        params.expectedValue = serializeArgument(options.expectedValue);
+      params.expectedValue = serializeArgument(options.expectedValue);
       const result = (await this._frame._channel.expect(params));
       if (result.received !== undefined)
         result.received = parseResult(result.received);
diff --git a/tests/playwright-test/playwright.expect.misc.spec.ts b/tests/playwright-test/playwright.expect.misc.spec.ts
index 5af9c06875..7c2fea0726 100644
--- a/tests/playwright-test/playwright.expect.misc.spec.ts
+++ b/tests/playwright-test/playwright.expect.misc.spec.ts
@@ -133,7 +133,7 @@ test('should support toHaveJSProperty with builtin types', async ({ runInlineTes
         await page.setContent('<div></div>');
         await page.$eval('div', e => e.foo = 'string');
         const locator = page.locator('div');
-        await expect(locator).toHaveJSProperty('foo', 'error', {timeout: 1000});
+        await expect(locator).toHaveJSProperty('foo', 'error', {timeout: 200});
       });
 
       test('pass number', async ({ page }) => {
@@ -147,7 +147,7 @@ test('should support toHaveJSProperty with builtin types', async ({ runInlineTes
         await page.setContent('<div></div>');
         await page.$eval('div', e => e.foo = 2021);
         const locator = page.locator('div');
-        await expect(locator).toHaveJSProperty('foo', 1, {timeout: 1000});
+        await expect(locator).toHaveJSProperty('foo', 1, {timeout: 200});
       });
 
       test('pass boolean', async ({ page }) => {
@@ -161,13 +161,40 @@ test('should support toHaveJSProperty with builtin types', async ({ runInlineTes
         await page.setContent('<div></div>');
         await page.$eval('div', e => e.foo = false);
         const locator = page.locator('div');
-        await expect(locator).toHaveJSProperty('foo', true, {timeout: 1000});
+        await expect(locator).toHaveJSProperty('foo', true, {timeout: 200});
+      });
+
+      test('pass boolean 2', async ({ page }) => {
+        await page.setContent('<div></div>');
+        await page.$eval('div', e => e.foo = false);
+        const locator = page.locator('div');
+        await expect(locator).toHaveJSProperty('foo', false);
+      });
+
+      test('fail boolean 2', async ({ page }) => {
+        await page.setContent('<div></div>');
+        await page.$eval('div', e => e.foo = false);
+        const locator = page.locator('div');
+        await expect(locator).toHaveJSProperty('foo', true, {timeout: 200});
+      });
+
+      test('pass undefined', async ({ page }) => {
+        await page.setContent('<div></div>');
+        const locator = page.locator('div');
+        await expect(locator).toHaveJSProperty('foo', undefined);
+      });
+
+      test('pass null', async ({ page }) => {
+        await page.setContent('<div></div>');
+        await page.$eval('div', e => e.foo = null);
+        const locator = page.locator('div');
+        await expect(locator).toHaveJSProperty('foo', null);
       });
       `,
   }, { workers: 1 });
   const output = stripAnsi(result.output);
-  expect(result.passed).toBe(3);
-  expect(result.failed).toBe(3);
+  expect(result.passed).toBe(6);
+  expect(result.failed).toBe(4);
   expect(result.exitCode).toBe(1);
   expect(output).toContain('Expected: "error"');
   expect(output).toContain('Received: "string"');