From 98dd9df17f854b78cc760c7d9e5f84e7d3e0c0a0 Mon Sep 17 00:00:00 2001
From: linguist <22963968+lowlighter@users.noreply.github.com>
Date: Wed, 30 Dec 2020 18:23:01 +0100
Subject: [PATCH] Fix code quality issues

---
 src/mocks.mjs         | 10 +++++-----
 tests/metrics.test.js |  7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/mocks.mjs b/src/mocks.mjs
index b69f815e..eea6672c 100644
--- a/src/mocks.mjs
+++ b/src/mocks.mjs
@@ -297,7 +297,7 @@
                   })
                 }
               //Commit content
-                if (/api.github.com.repos.lowlighter.metrics.commits.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/.test(url)) {
+                if (/^https:..api.github.com.repos.lowlighter.metrics.commits.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/.test(url)) {
                   console.debug(`metrics/compute/mocks > mocking rest api result > rest.request ${url}`)
                   return ({
                     status: 200,
@@ -509,7 +509,7 @@
               //Arguments
                 const [url, body] = args
               //Spotify api
-                if (/accounts.spotify.com.api.token/.test(url)) {
+                if (/^https:..accounts.spotify.com.api.token/.test(url)) {
                   //Access token generator
                     const params = new urls.URLSearchParams(body)
                     if ((params.get("grant_type") === "refresh_token")&&(params.get("client_id") === "MOCKED_CLIENT_ID")&&(params.get("client_secret") === "MOCKED_CLIENT_SECRET")&&(params.get("refresh_token") === "MOCKED_REFRESH_TOKEN")) {
@@ -535,7 +535,7 @@
               //Arguments
                 const [url, options] = args
               //Pagespeed api
-                if (/googleapis.com.pagespeedonline.v5/.test(url)) {
+                if (/^https:..www.googleapis.com.pagespeedonline.v5/.test(url)) {
                   //Pagespeed result
                     if (/v5.runPagespeed.*&key=MOCKED_TOKEN/.test(url)) {
                       console.debug(`metrics/compute/mocks > mocking pagespeed api result > ${url}`)
@@ -635,7 +635,7 @@
                     }
                 }
               //Spotify api
-                if (/api.spotify.com/.test(url)) {
+                if (/^https:..api.spotify.com/.test(url)) {
                   //Get recently played tracks
                     if (/me.player.recently-played/.test(url)&&(options?.headers?.Authorization === "Bearer MOCKED_TOKEN_ACCESS")) {
                       console.debug(`metrics/compute/mocks > mocking spotify api result > ${url}`)
@@ -695,7 +695,7 @@
                     }
                 }
               //Twitter api
-                if (/api.twitter.com/.test(url)) {
+                if (/^https:..api.twitter.com/.test(url)) {
                   //Get user profile
                     if ((/users.by.username/.test(url))&&(options?.headers?.Authorization === "Bearer MOCKED_TOKEN")) {
                       console.debug(`metrics/compute/mocks > mocking twitter api result > ${url}`)
diff --git a/tests/metrics.test.js b/tests/metrics.test.js
index 82404e2b..cf573ee2 100644
--- a/tests/metrics.test.js
+++ b/tests/metrics.test.js
@@ -202,7 +202,6 @@
       plugin_habits:true,
       plugin_habits_from:5,
       plugin_habits_charts:true,
-      plugin_habits_charts:true,
     }, {skip:["terminal", "repository"]}],
     ["Gists plugin (default)", {
       plugin_gists:true,
@@ -211,7 +210,7 @@
 
 //Tests run
   describe("GitHub Action", () =>
-    describe.skip.each([
+    describe.each([
       ["classic", {}],
       ["terminal", {}],
       ["repository", {repo:"metrics"}],
@@ -235,9 +234,9 @@
 
   describe("Web instance", () =>
     describe.each([
-    //  ["classic", {}],
+      ["classic", {}],
       ["terminal", {}],
-    //  ["repository", {repo:"metrics"}],
+      ["repository", {repo:"metrics"}],
     ])("Template : %s", (template, query) => {
       for (const [name, input, {skip = []} = {}] of tests)
         if (skip.includes(template))