to[Not]Match use tmatch directly

Fixes #98

CHANGES.md

@@ -1,3 +1,10 @@
+## [HEAD]
+
+- `toMatch` and `toNotMatch` use `tmatch` directly, so a wider array
+  of objects and patterns are supported
+
+[HEAD]: https://github.com/mjackson/expect/compare/v1.20.1...HEAD
+
 ## [v1.20.1]
 > May 7, 2016
 

modules/Expectation.js

@@ -1,6 +1,5 @@
 import has from 'has'
 import tmatch from 'tmatch'
-import isRegExp from 'is-regex'
 import assert from './assert'
 import { isSpy } from './SpyUtils'
 import {
@@ -169,26 +168,8 @@ class Expectation {
   }
 
   toMatch(pattern, message) {
-    let matches = false
-
-    if (typeof this.actual === 'string') {
-      assert(
-        isRegExp(pattern),
-        'The "pattern" argument in expect(string).toMatch(pattern) must be a RegExp'
-      )
-
-      matches = pattern.test(this.actual)
-    } else if (isObject(this.actual)) {
-      matches = tmatch(this.actual, pattern)
-    } else {
-      assert(
-        false,
-        'The "actual" argument in expect(actual).toMatch() must be a string or an object'
-      )
-    }
-
     assert(
-      matches,
+      tmatch(this.actual, pattern),
       (message || 'Expected %s to match %s'),
       this.actual,
       pattern
@@ -198,26 +179,8 @@ class Expectation {
   }
 
   toNotMatch(pattern, message) {
-    let matches = false
-
-    if (typeof this.actual === 'string') {
-      assert(
-        isRegExp(pattern),
-        'The "pattern" argument in expect(string).toNotMatch(pattern) must be a RegExp'
-      )
-
-      matches = pattern.test(this.actual)
-    } else if (isObject(this.actual)) {
-      matches = tmatch(this.actual, pattern)
-    } else {
-      assert(
-        false,
-        'The "actual" argument in expect(actual).toNotMatch() must be a string or an object'
-      )
-    }
-
     assert(
-      !matches,
+      !tmatch(this.actual, pattern),
       (message || 'Expected %s to not match %s'),
       this.actual,
       pattern

modules/__tests__/toMatch-test.js

@@ -1,12 +1,6 @@
 import expect from '../index'
 
 describe('expect(string).toMatch', () => {
-  it('requires the pattern to be a RegExp', () => {
-    expect(() => {
-      expect('actual').toMatch('expected')
-    }).toThrow(/must be a RegExp/)
-  })
-
   it('does not throw when the actual value matches the pattern', () => {
     expect(() => {
       expect('actual').toMatch(/^actual$/)
@@ -53,3 +47,15 @@ describe('expect(object).toMatch', () => {
     }).toThrow(/to match/)
   })
 })
+
+describe('expect(array).toMatch', () => {
+  it('does not throw when the array contains an object that matches the pattern', () => {
+    const array = [
+      { one: 'one' },
+      { two: 'two' },
+      { three: 'three' }
+    ]
+
+    expect(array).toMatch([ { one: /one/ } ])
+  })
+})

modules/__tests__/toNotMatch-test.js

@@ -1,12 +1,6 @@
 import expect from '../index'
 
 describe('expect(string).toNotMatch', () => {
-  it('requires the pattern to be a RegExp', () => {
-    expect(() => {
-      expect('actual').toNotMatch('expected')
-    }).toThrow(/must be a RegExp/)
-  })
-
   it('does not throw when the actual value does not match the pattern', () => {
     expect(() => {
       expect('actual').toNotMatch(/nope/)
@@ -53,3 +47,15 @@ describe('expect(object).toNotMatch', () => {
     }).toThrow(/to not match/)
   })
 })
+
+describe('expect(array).toNotMatch', () => {
+  it('does not throw when the array does not contain an object that matches the pattern', () => {
+    const array = [
+      { one: 'one' },
+      { two: 'two' },
+      { three: 'three' }
+    ]
+
+    expect(array).toNotMatch([ { one: /two/ } ])
+  })
+})