feat: contains allows for regexps against strings

testdouble · Jan 17, 2017 · f00a8d1 · f00a8d1
1 parent f2c6091
commit f00a8d1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/matchers/index.coffee b/src/matchers/index.coffee
@@ -50,6 +50,8 @@ module.exports =
             _.isEqual(actualElement, containing)
         else if _.isPlainObject(containing) && _.isPlainObject(actualArg)
           containsAllSpecified(containing, actualArg)
+        else if _.isRegExp(containing)
+          containing.test(actualArg)
         else
           _.includes(actualArg, containing)
 

diff --git a/src/util/lodash-wrap.coffee b/src/util/lodash-wrap.coffee
@@ -16,6 +16,7 @@ module.exports =
   isFunction: require('lodash/isFunction')
   isNumber: require('lodash/isNumber')
   isPlainObject: require('lodash/isPlainObject')
+  isRegExp: require('lodash/isRegExp')
   isString: require('lodash/isString')
   keys: require('lodash/keys')
   last: require('lodash/last')
@@ -24,4 +25,3 @@ module.exports =
   some: require('lodash/some')
   tap: require('lodash/tap')
   union: require('lodash/union')
-
diff --git a/test/src/matchers-test.coffee b/test/src/matchers-test.coffee
@@ -98,6 +98,11 @@ describe '.matchers', ->
       Then -> @matches(td.matchers.contains(deep: {thing: 'stuff'}), deep: {thing: 'stuff', shallow: 5}) == true
       Then -> @matches(td.matchers.contains({container: {size: 'S'}}), {ingredient: 'beans', container: { type: 'cup', size: 'S'}}) == true
 
+    context 'regexp', ->
+      Then -> @matches(td.matchers.contains(/abc/), 'abc') == true
+      Then -> @matches(td.matchers.contains(/abc/), foo: 'bar') == false
+      Then -> @matches(td.matchers.contains(/abc/), ['foo', 'bar']) == false
+
     context 'nonsense', ->
       Then -> @matches(td.matchers.contains(42), 42) == false
       Then -> @matches(td.matchers.contains(null), 'shoo') == false
@@ -112,6 +117,3 @@ describe '.matchers', ->
     Then -> @matches(td.matchers.not(5), 6) == true
     Then -> @matches(td.matchers.not(5), 5) == false
     Then -> @matches(td.matchers.not(['hi']), ['hi']) == false
-
-
-