Improve function name

OpenTermsArchive · Apr 8, 2024 · ec90771 · ec90771
1 parent 7357620
commit ec90771
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/scripts/declarations/lint/index.mocha.js b/scripts/declarations/lint/index.mocha.js
@@ -31,7 +31,7 @@ export default async options => {
   if (options.modified) {
     const declarationUtils = new DeclarationUtils(instancePath);
 
-    ({ services: servicesToValidate } = await declarationUtils.getModifiedServicesTermsTypes());
+    ({ services: servicesToValidate } = await declarationUtils.getModifiedServicesAndTermsTypes());
   }
 
   const lintFile = lintAndFixFile(options.fix);

diff --git a/scripts/declarations/utils/index.js b/scripts/declarations/utils/index.js
@@ -36,7 +36,7 @@ export default class DeclarationUtils {
     return modifiedServicesIds;
   }
 
-  async getModifiedServicesTermsTypes() {
+  async getModifiedServicesAndTermsTypes() {
     const { modifiedFilePaths } = await this.getModifiedData();
     const servicesTermsTypes = {};
 

diff --git a/scripts/declarations/utils/index.test.js b/scripts/declarations/utils/index.test.js
@@ -37,7 +37,7 @@ const removeLatestCommit = async () => {
 };
 
 describe('DeclarationUtils', () => {
-  describe('#getModifiedServicesTermsTypes', () => {
+  describe('#getModifiedServicesAndTermsTypes', () => {
     before(async () => {
       await loadFixtures();
       await setupRepository();
@@ -50,7 +50,7 @@ describe('DeclarationUtils', () => {
       after(() => removeLatestCommit());
 
       it('returns the service ID and the updated terms type', async () => {
-        expect(await declarationUtils.getModifiedServicesTermsTypes()).to.deep.equal({
+        expect(await declarationUtils.getModifiedServicesAndTermsTypes()).to.deep.equal({
           services: ['ServiceA'],
           servicesTermsTypes: { ServiceA: ['Terms of Service'] },
         });
@@ -62,7 +62,7 @@ describe('DeclarationUtils', () => {
       after(() => removeLatestCommit());
 
       it('returns the service ID and the added terms type', async () => {
-        expect(await declarationUtils.getModifiedServicesTermsTypes()).to.deep.equal({
+        expect(await declarationUtils.getModifiedServicesAndTermsTypes()).to.deep.equal({
           services: ['ServiceA'],
           servicesTermsTypes: { ServiceA: ['Imprint'] },
         });
@@ -74,7 +74,7 @@ describe('DeclarationUtils', () => {
       after(() => removeLatestCommit());
 
       it('returns the added service ID along with the associated terms type', async () => {
-        expect(await declarationUtils.getModifiedServicesTermsTypes()).to.deep.equal({
+        expect(await declarationUtils.getModifiedServicesAndTermsTypes()).to.deep.equal({
           services: ['ServiceB'],
           servicesTermsTypes: { ServiceB: ['Terms of Service'] },
         });
@@ -89,7 +89,7 @@ describe('DeclarationUtils', () => {
       });
 
       it('returns no services and no terms types', async () => {
-        expect(await declarationUtils.getModifiedServicesTermsTypes()).to.deep.equal({
+        expect(await declarationUtils.getModifiedServicesAndTermsTypes()).to.deep.equal({
           services: [],
           servicesTermsTypes: {},
         });
@@ -101,7 +101,7 @@ describe('DeclarationUtils', () => {
       after(() => removeLatestCommit());
 
       it('returns no services and no terms types', async () => {
-        expect(await declarationUtils.getModifiedServicesTermsTypes()).to.deep.equal({
+        expect(await declarationUtils.getModifiedServicesAndTermsTypes()).to.deep.equal({
           services: [],
           servicesTermsTypes: {},
         });
@@ -120,7 +120,7 @@ describe('DeclarationUtils', () => {
       });
 
       it('returns the services IDs and the updated terms types', async () => {
-        expect(await declarationUtils.getModifiedServicesTermsTypes()).to.deep.equal({
+        expect(await declarationUtils.getModifiedServicesAndTermsTypes()).to.deep.equal({
           services: [ 'ServiceA', 'ServiceB' ],
           servicesTermsTypes: {
             ServiceA: [ 'Privacy Policy', 'Terms of Service' ],

diff --git a/scripts/declarations/validate/index.mocha.js b/scripts/declarations/validate/index.mocha.js
@@ -37,7 +37,7 @@ export default async options => {
   if (options.modified) {
     const declarationUtils = new DeclarationUtils(instancePath);
 
-    ({ services: servicesToValidate, servicesTermsTypes } = await declarationUtils.getModifiedServicesTermsTypes());
+    ({ services: servicesToValidate, servicesTermsTypes } = await declarationUtils.getModifiedServicesAndTermsTypes());
   }
 
   describe('Service declarations validation', async function () {