Simplified RegexSpecFilter

Author: sgravrock

lib/filters/regex_spec_filter.js

@@ -1,10 +1,9 @@
-module.exports = exports = RegexSpecFilter;
+module.exports = exports = regexSpecFilter;
 
-function RegexSpecFilter(options) {
-  const filterString = options && options.filterString;
+function regexSpecFilter(filterString) {
   const filterPattern = new RegExp(filterString);
 
-  this.matches = function(specName) {
-    return filterPattern.test(specName);
+  return function(spec) {
+    return filterPattern.test(spec.getFullName());
   };
 }

lib/jasmine.js

@@ -1,5 +1,5 @@
 const ExitHandler = require('./exit_handler');
-const RegexSpecFilter = require('./filters/regex_spec_filter');
+const regexSpecFilter = require('./filters/regex_spec_filter');
 const RunnerBase = require('./runner_base');
 
 /**
@@ -196,12 +196,9 @@ class Jasmine extends RunnerBase {
     }
 
     if (filterString) {
-      const specFilter = new RegexSpecFilter({
-        filterString: filterString
+      this.env.configure({
+        specFilter: regexSpecFilter(filterString)
       });
-      this.env.configure({specFilter: function(spec) {
-          return specFilter.matches(spec.getFullName());
-        }});
     }
 
     if (files && files.length > 0) {

lib/parallel_worker.js

@@ -1,4 +1,4 @@
-const RegexSpecFilter = require("./filters/regex_spec_filter");
+const regexSpecFilter = require("./filters/regex_spec_filter");
 
 class ParallelWorker {
   constructor(options) {
@@ -65,13 +65,8 @@ class ParallelWorker {
         }
 
         if (options.filter) {
-          const specFilter = new RegexSpecFilter({
-            filterString: options.filter
-          });
           env.configure({
-            specFilter: function (spec) {
-              return specFilter.matches(spec.getFullName());
-            }
+            specFilter: regexSpecFilter(options.filter)
           });
         }
 

spec/filters/regex_spec_filter_spec.js

@@ -1,30 +1,25 @@
-const RegexSpecFilter = require('../../lib/filters/regex_spec_filter');
-
-describe("RegexSpecFilter", function() {
+const regexSpecFilter = require('../../lib/filters/regex_spec_filter');
 
+describe("regexSpecFilter", function() {
   it("should match when no string is provided", function() {
-    const specFilter = new RegexSpecFilter();
+    const specFilter = regexSpecFilter();
 
-    expect(specFilter.matches("foo")).toBe(true);
-    expect(specFilter.matches("*bar")).toBe(true);
+    expect(specFilter({ getFullName: () => "foo" })).toBe(true);
+    expect(specFilter({ getFullName: () => "*bar" })).toBe(true);
   });
 
   it("should match the provided string", function() {
-    const specFilter = new RegexSpecFilter({
-      filterString: "foo"
-    });
+    const specFilter = regexSpecFilter("foo");
 
-    expect(specFilter.matches("foo")).toBe(true);
-    expect(specFilter.matches("bar")).toBe(false);
+    expect(specFilter({ getFullName: () => "foo"})).toBe(true);
+    expect(specFilter({ getFullName: () => "bar"})).toBe(false);
   });
 
   it("should match by part of spec name", function() {
-    const specFilter = new RegexSpecFilter({
-      filterString: "ba"
-    });
+    const specFilter = regexSpecFilter("ba");
 
-    expect(specFilter.matches("foo")).toBe(false);
-    expect(specFilter.matches("bar")).toBe(true);
-    expect(specFilter.matches("baz")).toBe(true);
+    expect(specFilter({ getFullName: () => "foo"})).toBe(false);
+    expect(specFilter({ getFullName: () => "bar"})).toBe(true);
+    expect(specFilter({ getFullName: () => "baz"})).toBe(true);
   });
 });