fix: rinominazione metodi di utils

italia · Feb 6, 2023 · 7c401c4 · 7c401c4
1 parent 1496ffd
commit 7c401c4
Show file tree

Hide file tree

Showing 13 changed files with 111 additions and 111 deletions.
diff --git a/src/audits/municipality/bookingAppointmentAudit.ts b/src/audits/municipality/bookingAppointmentAudit.ts
@@ -4,7 +4,7 @@
 import lighthouse from "lighthouse";
 import { loadPageData } from "../../utils/utils";
 import {
-  getRandomMunicipalityThirdLevelPagesUrl,
+  getRandomThirdLevelPagesUrl,
   getServicePageUrl,
 } from "../../utils/municipality/utils";
 import { auditDictionary } from "../../storage/auditDictionary";
@@ -49,7 +49,7 @@ class LoadAudit extends Audit {
     ];
 
     const randomServices: string[] =
-      await getRandomMunicipalityThirdLevelPagesUrl(
+      await getRandomThirdLevelPagesUrl(
         url,
         await getServicePageUrl(url),
         '[data-element="service-link"]'

diff --git a/src/audits/municipality/bootstrapItaliaDoubleCheckAudit.ts b/src/audits/municipality/bootstrapItaliaDoubleCheckAudit.ts
@@ -12,9 +12,9 @@ import {
   loadPageData,
 } from "../../utils/utils";
 import {
-  getRandomMunicipalityFirstLevelPagesUrl,
-  getRandomMunicipalitySecondLevelPagesUrl,
-  getRandomMunicipalityThirdLevelPagesUrl,
+  getRandomFirstLevelPagesUrl,
+  getRandomSecondLevelPagesUrl,
+  getRandomThirdLevelPagesUrl,
   getServicePageUrl,
 } from "../../utils/municipality/utils";
 import { auditScanVariables } from "../../storage/municipality/auditScanVariables";
@@ -93,15 +93,15 @@ class LoadAudit extends Audit {
 
     const pagesToBeAnalyzed = [
       url,
-      ...(await getRandomMunicipalityFirstLevelPagesUrl(
+      ...(await getRandomFirstLevelPagesUrl(
         url,
         auditVariables.numberOfFirstLevelPageToBeScanned
       )),
-      ...(await getRandomMunicipalitySecondLevelPagesUrl(
+      ...(await getRandomSecondLevelPagesUrl(
         url,
         auditVariables.numberOfSecondLevelPageToBeScanned
       )),
-      ...(await getRandomMunicipalityThirdLevelPagesUrl(
+      ...(await getRandomThirdLevelPagesUrl(
         url,
         await getServicePageUrl(url),
         '[data-element="service-link"]',

diff --git a/src/audits/municipality/contactsAssistencyAudit.ts b/src/audits/municipality/contactsAssistencyAudit.ts
@@ -4,7 +4,7 @@
 import lighthouse from "lighthouse";
 import { getPageElementDataAttribute, loadPageData } from "../../utils/utils";
 import {
-  getRandomMunicipalityThirdLevelPagesUrl,
+  getRandomThirdLevelPagesUrl,
   getServicePageUrl,
 } from "../../utils/municipality/utils";
 import { CheerioAPI } from "cheerio";
@@ -60,7 +60,7 @@ class LoadAudit extends Audit {
     ];
 
     const randomServices: string[] =
-      await getRandomMunicipalityThirdLevelPagesUrl(
+      await getRandomThirdLevelPagesUrl(
         url,
         await getServicePageUrl(url),
         '[data-element="service-link"]'

diff --git a/src/audits/municipality/cookieDomainCheckAudit.ts b/src/audits/municipality/cookieDomainCheckAudit.ts
@@ -8,9 +8,9 @@ import { run as cookieAudit } from "../../utils/cookieAuditLogic";
 import crawlerTypes from "../../types/crawler-types";
 import cookie = crawlerTypes.cookie;
 import {
-  getRandomMunicipalityFirstLevelPagesUrl,
-  getRandomMunicipalitySecondLevelPagesUrl,
-  getRandomMunicipalityThirdLevelPagesUrl,
+  getRandomFirstLevelPagesUrl,
+  getRandomSecondLevelPagesUrl,
+  getRandomThirdLevelPagesUrl,
   getServicePageUrl,
 } from "../../utils/municipality/utils";
 import { auditScanVariables } from "../../storage/municipality/auditScanVariables";
@@ -76,21 +76,21 @@ class LoadAudit extends Audit {
 
     const pagesToBeAnalyzed = [
       url,
-      ...(await getRandomMunicipalityFirstLevelPagesUrl(
+      ...(await getRandomFirstLevelPagesUrl(
         url,
         auditVariables.numberOfFirstLevelPageToBeScanned
       )),
-      ...(await getRandomMunicipalitySecondLevelPagesUrl(
+      ...(await getRandomSecondLevelPagesUrl(
         url,
         auditVariables.numberOfSecondLevelPageToBeScanned
       )),
-      ...(await getRandomMunicipalityThirdLevelPagesUrl(
+      ...(await getRandomThirdLevelPagesUrl(
         url,
         await getServicePageUrl(url),
         '[data-element="service-link"]',
         auditVariables.numberOfServicesToBeScanned
       )),
-      ...(await getRandomMunicipalityThirdLevelPagesUrl(
+      ...(await getRandomThirdLevelPagesUrl(
         url,
         await getButtonUrl(
           await loadPageData(url),

diff --git a/src/audits/municipality/fontsCheckAudit.ts b/src/audits/municipality/fontsCheckAudit.ts
@@ -4,7 +4,7 @@
 import lighthouse from "lighthouse";
 import { allowedFonts } from "../../storage/municipality/allowedFonts";
 import {
-  getRandomMunicipalityThirdLevelPagesUrl,
+  getRandomThirdLevelPagesUrl,
   getServicePageUrl,
 } from "../../utils/municipality/utils";
 import puppeteer from "puppeteer";
@@ -53,7 +53,7 @@ class LoadAudit extends Audit {
     const url = artifacts.origin;
 
     const randomServices: string[] =
-      await getRandomMunicipalityThirdLevelPagesUrl(
+      await getRandomThirdLevelPagesUrl(
         url,
         await getServicePageUrl(url),
         '[data-element="service-link"]'

diff --git a/src/audits/municipality/metatagAudit.ts b/src/audits/municipality/metatagAudit.ts
@@ -4,7 +4,7 @@
 import lighthouse from "lighthouse";
 import { loadPageData } from "../../utils/utils";
 import {
-  getRandomMunicipalityThirdLevelPagesUrl,
+  getRandomThirdLevelPagesUrl,
   getServicePageUrl,
 } from "../../utils/municipality/utils";
 import { CheerioAPI } from "cheerio";
@@ -65,7 +65,7 @@ class LoadAudit extends Audit {
     ];
 
     const randomServices: string[] =
-      await getRandomMunicipalityThirdLevelPagesUrl(
+      await getRandomThirdLevelPagesUrl(
         url,
         await getServicePageUrl(url),
         '[data-element="service-link"]'

diff --git a/src/audits/municipality/serviziAudit.ts b/src/audits/municipality/serviziAudit.ts
@@ -13,7 +13,7 @@ import {
   toMenuItem,
 } from "../../utils/utils";
 import {
-  getRandomMunicipalityThirdLevelPagesUrl,
+  getRandomThirdLevelPagesUrl,
   getServicePageUrl,
 } from "../../utils/municipality/utils";
 import {
@@ -89,7 +89,7 @@ class LoadAudit extends Audit {
     const mandatoryBodyVoices = contentTypeItemsBody;
 
     const randomServices: string[] =
-      await getRandomMunicipalityThirdLevelPagesUrl(
+      await getRandomThirdLevelPagesUrl(
         url,
         await getServicePageUrl(url),
         '[data-element="service-link"]',

diff --git a/src/audits/school/bootstrapItaliaDoubleCheckAudit.ts b/src/audits/school/bootstrapItaliaDoubleCheckAudit.ts
@@ -10,9 +10,9 @@ const Audit = lighthouse.Audit;
 
 import { checkCSSClassesOnPage } from "../../utils/utils";
 import {
-  getRandomSchoolFirstLevelPagesUrl,
-  getRandomSchoolSecondLevelPagesUrl,
-  getRandomSchoolServicesUrl,
+  getRandomFirstLevelPagesUrl,
+  getRandomSecondLevelPagesUrl,
+  getRandomServicesUrl,
 } from "../../utils/school/utils";
 import { auditScanVariables } from "../../storage/school/auditScanVariables";
 import { cssClasses } from "../../storage/school/cssClasses";
@@ -87,15 +87,15 @@ class LoadAudit extends Audit {
 
     const pagesToBeAnalyzed = [
       url,
-      ...(await getRandomSchoolFirstLevelPagesUrl(
+      ...(await getRandomFirstLevelPagesUrl(
         url,
         auditVariables.numberOfFirstLevelPageToBeScanned
       )),
-      ...(await getRandomSchoolSecondLevelPagesUrl(
+      ...(await getRandomSecondLevelPagesUrl(
         url,
         auditVariables.numberOfSecondLevelPageToBeScanned
       )),
-      ...(await getRandomSchoolServicesUrl(
+      ...(await getRandomServicesUrl(
         url,
         auditVariables.numberOfServicesToBeScanned
       )),

diff --git a/src/audits/school/cookieDomainCheckAudit.ts b/src/audits/school/cookieDomainCheckAudit.ts
@@ -4,10 +4,10 @@
 // @ts-ignore
 import lighthouse from "lighthouse";
 import {
-  getRandomSchoolFirstLevelPagesUrl,
-  getRandomSchoolSecondLevelPagesUrl,
-  getRandomSchoolServicesUrl,
-  getRandomSchoolLocationsUrl,
+  getRandomFirstLevelPagesUrl,
+  getRandomSecondLevelPagesUrl,
+  getRandomServicesUrl,
+  getRandomLocationsUrl,
 } from "../../utils/school/utils";
 import crawlerTypes from "../../types/crawler-types";
 import cookie = crawlerTypes.cookie;
@@ -73,19 +73,19 @@ class LoadAudit extends Audit {
 
     const pagesToBeAnalyzed = [
       url,
-      ...(await getRandomSchoolFirstLevelPagesUrl(
+      ...(await getRandomFirstLevelPagesUrl(
         url,
         auditVariables.numberOfFirstLevelPageToBeScanned
       )),
-      ...(await getRandomSchoolSecondLevelPagesUrl(
+      ...(await getRandomSecondLevelPagesUrl(
         url,
         auditVariables.numberOfSecondLevelPageToBeScanned
       )),
-      ...(await getRandomSchoolServicesUrl(
+      ...(await getRandomServicesUrl(
         url,
         auditVariables.numberOfServicesToBeScanned
       )),
-      ...(await getRandomSchoolLocationsUrl(
+      ...(await getRandomLocationsUrl(
         url,
         auditVariables.numberOfLocationsToBeScanned
       )),

diff --git a/src/audits/school/fontsCheckAudit.ts b/src/audits/school/fontsCheckAudit.ts
@@ -3,7 +3,7 @@
 // @ts-ignore
 import lighthouse from "lighthouse";
 import { allowedFonts } from "../../storage/school/allowedFonts";
-import { getRandomSchoolServicesUrl } from "../../utils/school/utils";
+import { getRandomServicesUrl } from "../../utils/school/utils";
 import puppeteer from "puppeteer";
 import { auditDictionary } from "../../storage/auditDictionary";
 
@@ -49,7 +49,7 @@ class LoadAudit extends Audit {
   ): Promise<LH.Audit.ProductBase> {
     const url = artifacts.origin;
 
-    const randomService: string[] = await getRandomSchoolServicesUrl(url);
+    const randomService: string[] = await getRandomServicesUrl(url);
 
     if (randomService.length === 0) {
       return {

diff --git a/src/audits/school/serviziAudit.ts b/src/audits/school/serviziAudit.ts
@@ -12,7 +12,7 @@ import {
   missingMenuItems,
   toMenuItem,
 } from "../../utils/utils";
-import { getRandomSchoolServicesUrl } from "../../utils/school/utils";
+import { getRandomServicesUrl } from "../../utils/school/utils";
 import {
   contentTypeItemsBody,
   contentTypeItemsHeaders,
@@ -96,7 +96,7 @@ class LoadAudit extends Audit {
 
     const mandatoryMetadata = contentTypeItemsMetadata;
 
-    const randomServices: string[] = await getRandomSchoolServicesUrl(
+    const randomServices: string[] = await getRandomServicesUrl(
       url,
       auditVariables.numberOfServicesToBeScanned
     );

diff --git a/src/utils/municipality/utils.ts b/src/utils/municipality/utils.ts
@@ -9,7 +9,7 @@ import {
   loadPageData,
 } from "../utils";
 
-const getRandomMunicipalityFirstLevelPagesUrl = async (
+const getRandomFirstLevelPagesUrl = async (
   url: string,
   numberOfPages = 1
 ): Promise<string[]> => {
@@ -38,7 +38,7 @@ const getRandomMunicipalityFirstLevelPagesUrl = async (
   return getRandomNString(pagesUrls, numberOfPages);
 };
 
-const getRandomMunicipalitySecondLevelPagesUrl = async (
+const getRandomSecondLevelPagesUrl = async (
   url: string,
   numberOfPages = 1
 ): Promise<string[]> => {
@@ -80,7 +80,7 @@ const getRandomMunicipalitySecondLevelPagesUrl = async (
   return getRandomNString(pagesUrls, numberOfPages);
 };
 
-const getRandomMunicipalityThirdLevelPagesUrl = async (
+const getRandomThirdLevelPagesUrl = async (
   url: string,
   pageUrl: string,
   linkDataElement: string,
@@ -156,8 +156,8 @@ const getServicePageUrl = async (url: string) => {
 };
 
 export {
-  getRandomMunicipalityFirstLevelPagesUrl,
-  getRandomMunicipalitySecondLevelPagesUrl,
-  getRandomMunicipalityThirdLevelPagesUrl,
+  getRandomFirstLevelPagesUrl,
+  getRandomSecondLevelPagesUrl,
+  getRandomThirdLevelPagesUrl,
   getServicePageUrl,
 };