webworkadmin
diff --git a/‎src/raven.js
Lines changed: 15 additions & 2 deletions b/‎src/raven.js
Lines changed: 15 additions & 2 deletions
diff --git a/‎test/raven.test.js
Lines changed: 17 additions & 0 deletions b/‎test/raven.test.js
Lines changed: 17 additions & 0 deletions
@@ -347,6 +347,10 @@ function isFunction(what) {
     return typeof what === 'function';
 }
 
+function isString(what) {
+    return typeof what === 'string';
+}
+
 function each(obj, callback) {
     var i, j;
 
@@ -630,10 +634,19 @@ function isSetup() {
 }
 
 function joinRegExp(patterns) {
-    // Combine an array of regular expressions into one large regexp
+    // Combine an array of regular expressions and strings into one large regexp
     var sources = [], i = patterns.length;
     // lol, map
-    while (i--) sources[i] = patterns[i].source;
+    while (i--) {
+        if (isString(patterns[i])) {
+            // If it's a string, we need to escape it
+            // Taken from: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions
+            sources[i] = patterns[i].replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1");
+        } else {
+            // If it's a regexp already, we want to extract the source
+            sources[i] = patterns[i].source;
+        }
+    }
     return new RegExp(sources.join('|'), 'i');
 }
 
 
@@ -93,6 +93,15 @@ describe('globals', function() {
     });
   });
 
+  describe('isString', function() {
+    it('should do as advertised', function() {
+      assert.isTrue(isString(''));
+      assert.isFalse(isString({}));
+      assert.isFalse(isString(undefined));
+      assert.isFalse(isString(function(){}))
+    });
+  });
+
   describe('isSetup', function() {
     it('should return false with no JSON support', function() {
       globalServer = 'http://localhost/';
@@ -773,6 +782,14 @@ describe('globals', function() {
       ]);
     });
   });
+
+  describe('joinRegExp', function() {
+    it('should work as advertised', function() {
+      assert.equal(joinRegExp([
+        'a', 'b', 'a.b', /d/, /[0-9]/
+      ]).source, 'a|b|a\\.b|d|[0-9]');
+    });
+  });
 });
 
 describe('Raven (public API)', function() {