Ensure toContain only accepts strings when received is a string

Follow-up of jestjs#10119
dubzzz · Dec 8, 2020 · 59274dd · 59274dd
1 parent 3a40820
commit 59274dd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap b/packages/expect/src/__tests__/__snapshots__/matchers.test.js.snap
@@ -1989,6 +1989,17 @@ Received has type:  string
 Received has value: <r>"undefined"</>
 `;
 
+exports[`.toContain(), .toContainEqual() error cases 5`] = `
+<d>expect(</><r>false</><d>).</>toContain<d>(</><g>false</><d>) // indexOf</>
+
+<b>Matcher error</>: <g>expected</> value must be a string if <r>received</> value is a string
+
+Expected has type:  boolean
+Expected has value: <g>false</>
+Received has type:  string
+Received has value: <r>"false"</>
+`;
+
 exports[`.toContain(), .toContainEqual() error cases for toContainEqual 1`] = `
 <d>expect(</><r>received</><d>).</>toContainEqual<d>(</><g>expected</><d>) // deep equality</>
 

diff --git a/packages/expect/src/__tests__/matchers.test.js b/packages/expect/src/__tests__/matchers.test.js
@@ -1470,6 +1470,14 @@ describe('.toContain(), .toContainEqual()', () => {
     expect(() =>
       jestExpect('undefined').toContain(undefined),
     ).toThrowErrorMatchingSnapshot();
+    expect(() =>
+      jestExpect('false').toContain(false),
+    ).toThrowErrorMatchingSnapshot();
+    if (isBigIntDefined) {
+      expect(() => jestExpect('1').toContain(BigInt(1))).toThrowError(
+        'toContain',
+      );
+    }
   });
 
   [

diff --git a/packages/expect/src/matchers.ts b/packages/expect/src/matchers.ts
@@ -480,18 +480,7 @@ const matchers: MatchersObject = {
         'received',
       )} value is a string`;
 
-      if (expected == null) {
-        throw new Error(
-          matcherErrorMessage(
-            matcherHint(matcherName, received, String(expected), options),
-            wrongTypeErrorMessage,
-            printWithType('Expected', expected, printExpected) +
-              '\n' +
-              printWithType('Received', received, printReceived),
-          ),
-        );
-      }
-      if (typeof expected === 'number') {
+      if (typeof expected !== 'string') {
         throw new Error(
           matcherErrorMessage(
             matcherHint(matcherName, received, String(expected), options),