Merge branch 'development'

MisterPhilip · Nov 7, 2020 · ceed417 · ceed417
2 parents 040f5a3 + 6a68800
commit ceed417
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -14,7 +14,7 @@ module.exports = function (grunt) {
             },
             "production": {
                 "name": "Omnibug",
-                "version": "1.17.0",
+                "version": "1.17.1",
                 "storageKey": "omnibug",
                 "feedbackUrl": "https://github.com/MisterPhilip/omnibug/issues",
                 "analyticsID": "UA-114343677-2"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "omnibug",
-    "version": "1.17.0",
+    "version": "1.17.1",
     "description": "Omnibug Extension",
     "main": "Gruntfile.js",
     "scripts": {

diff --git a/src/devtools/panel.js b/src/devtools/panel.js
@@ -779,6 +779,7 @@ window.Omnibug = (() => {
             });
         });
 
+        console.log(settings.renameParameters);
         let data = request.data.reduce((groups, item) => {
             if (!item.hidden) {
                 const val = item.group;
@@ -916,7 +917,7 @@ window.Omnibug = (() => {
         let styleSheet = d.getElementById("settingsStyles");
         const defaults = (new OmnibugSettings).defaults;
 
-        const settings = Object.assign({}, defaults, newSettings);
+        settings = Object.assign({}, defaults, newSettings);
 
         let theme = settings.theme,
             themeType = theme === "auto" ? "auto" : "manual";
@@ -1178,7 +1179,8 @@ window.Omnibug = (() => {
          * @param message
          */
         receive_message(message) {
-            switch (message.event || "") {
+            message.event = message.event || "";
+            switch (message.event) {
                 case "webRequest":
                     addRequest(message);
                     break;

diff --git a/src/providers/AdobeLaunch.js b/src/providers/AdobeLaunch.js
@@ -11,7 +11,7 @@ class AdobeLaunchProvider extends BaseProvider
     {
         super();
         this._key        = "ADOBELAUNCH";
-        this._pattern    = /assets\.adobedtm\.com\/launch-[^?#]+.js/;
+        this._pattern    = /assets\.adobedtm\.com(?:\/[^?#;]+)?\/launch-[^?#]+.js/;
         this._name       = "Adobe Launch";
         this._type       = "tagmanager";
         this._keywords   = ["activate", "activation", "tms"];
@@ -66,4 +66,4 @@ class AdobeLaunchProvider extends BaseProvider
 
         return results;
     }
-}
+}
diff --git a/test/providers/AdobeLaunch.js b/test/providers/AdobeLaunch.js
@@ -18,7 +18,8 @@ test("AdobeLaunchProvider pattern should match Adobe Launch calls", t => {
             "https://assets.adobedtm.com/launch-ENf3494c5e66666d119e0e439ecc59e176-staging.min.js",
             "https://assets.adobedtm.com/launch-ENf3494c5e66666d119e0e439ecc59e176-development.min.js",
             "https://assets.adobedtm.com/launch-ENf3494c5e66666d119e0e439ecc59e176.js",
-            "https://assets.adobedtm.com/launch-ENf3494c5e66666d119e0e439ecc59e176.min.js?cachebuster=1234abc"
+            "https://assets.adobedtm.com/launch-ENf3494c5e66666d119e0e439ecc59e176.min.js?cachebuster=1234abc",
+            "https://assets.adobedtm.com/abc123/abc123/launch-ENf3494c5e66666d119e0e439ecc59e176.js",
         ],
         badUrls = [
             "https://assets.adobedtm.com/satelliteLib-ENf3494c5e66666d119e0e439ecc59e176.js",
@@ -45,7 +46,7 @@ test("OmnibugProvider returns Adobe Launch", t => {
 test("AdobeLaunchProvider returns custom data", t => {
     let provider = new AdobeLaunchProvider(),
         developmentUrl = "https://assets.adobedtm.com/launch-ENf3494c5e66666d119e0e439ecc59e176-development.min.js",
-        stagingUrl = "https://assets.adobedtm.com/launch-ENf3494c5e66666d119e0e439ecc59e176-staging.min.js",
+        stagingUrl = "https://assets.adobedtm.com/abc123/abc123/launch-ENf3494c5e66666d119e0e439ecc59e176-staging.min.js",
         prodUrl = "https://assets.adobedtm.com/launch-ENf3494c5e66666d119e0e439ecc59e176.min.js",
         developmentResults = provider.parseUrl(developmentUrl),
         stagingResults = provider.parseUrl(stagingUrl),
@@ -66,4 +67,4 @@ test("AdobeLaunchProvider returns custom data", t => {
     t.is(stagingEnv.value, "staging");
     t.is(typeof prodEnv, "object");
     t.is(prodEnv.value, "production");
-});
+});