Merge pull request #61 from featurist/master

--grep doesn't do regular expressions
karma-runner · May 19, 2015 · 85a13e1 · 85a13e1
2 parents e3ae4e0 + 01d11e6
commit 85a13e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/adapter.js b/src/adapter.js
@@ -110,11 +110,11 @@ var createMochaStartFn = function(mocha) {
         arrayReduce(clientArguments, function(isGrepArg, arg) {
           var match;
           if (isGrepArg) {
-            mocha.grep(arg);
+            mocha.grep(new RegExp(arg));
           } else if (arg === '--grep') {
             return true;
           } else if (match = /--grep=(.*)/.exec(arg)) {
-            mocha.grep(match[1]);
+            mocha.grep(new RegExp(match[1]));
           }
           return false;
         }, false);

diff --git a/test/adapter.spec.js b/test/adapter.spec.js
@@ -249,7 +249,7 @@ describe('adapter mocha', function() {
         args: ['--grep', 'test test']
       });
 
-      expect(this.mockMocha.grep.getCall(0).args).to.deep.eq(['test test']);
+      expect(this.mockMocha.grep.getCall(0).args).to.deep.eq([/test test/]);
     });
 
     it('should pass grep argument to mocha if we called the run with --grep=xxx', function() {
@@ -259,7 +259,7 @@ describe('adapter mocha', function() {
         args: ['--grep=test test']
       });
 
-      expect(this.mockMocha.grep.getCall(0).args).to.deep.eq(['test test']);
+      expect(this.mockMocha.grep.getCall(0).args).to.deep.eq([/test test/]);
     });
 
     it('should pass grep argument to mocha if config.args contains property grep', function(){