@opentermsarchive/engine 1.1.2 → 1.1.3

package/.eslintrc.yaml

@@ -10,6 +10,7 @@ plugins:
   - chai-friendly
   - import
   - json-format
+  - no-only-tests
 rules:
   arrow-parens:
     - error
@@ -101,6 +102,7 @@ rules:
     - error
     - properties: false
   require-await: 1
+  no-only-tests/no-only-tests: error
 
 overrides:
   - files:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentermsarchive/engine",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Tracks and makes visible changes to the terms of online services",
   "homepage": "https://opentermsarchive.org",
   "bugs": {
@@ -103,6 +103,7 @@
   "devDependencies": {
     "@commitlint/cli": "^19.0.3",
     "dir-compare": "^4.0.0",
+    "eslint-plugin-no-only-tests": "^3.1.0",
     "keep-a-changelog": "^2.5.3",
     "nock": "^13.2.1",
     "node-stream-zip": "^1.15.0",

package/scripts/declarations/utils/fixtures/serviceATermsUpdated.history.json

@@ -0,0 +1,9 @@
+{
+  "Terms of Service": [
+    {
+      "fetch": "https://domain.example/tos",
+      "select": "body",
+      "validUntil": "2024-03-18T18:30:09Z"
+    }
+  ]
+}

package/scripts/declarations/utils/index.js

@@ -43,6 +43,10 @@ export default class DeclarationUtils {
     await Promise.all(modifiedFilePaths.map(async modifiedFilePath => {
       const serviceId = DeclarationUtils.getServiceIdFromFilePath(modifiedFilePath);
 
+      if (modifiedFilePath.endsWith('.history.json')) {
+        return; // Assuming history modifications imply corresponding changes in the service declaration and that the analysis of which terms types of this service have changed will be done when analysing the related declaration, no further action is required here
+      }
+
       if (modifiedFilePath.endsWith('.filters.js')) {
         const declaration = await this.getJSONFromFile(this.defaultBranch, `declarations/${serviceId}.json`);
 

package/scripts/declarations/utils/index.test.js

@@ -15,6 +15,7 @@ const SUBJECT_PATH = path.resolve(__dirname, './test');
 const FIXTURES = {
   serviceA: { path: './fixtures/serviceA.json' },
   serviceATermsUpdated: { path: './fixtures/serviceATermsUpdated.json' },
+  serviceATermsUpdatedHistory: { path: './fixtures/serviceATermsUpdated.history.json' },
   serviceAMultipleTermsUpdated: { path: './fixtures/serviceAMultipleTermsUpdated.json' },
   serviceATermsAdded: { path: './fixtures/serviceATermsAdded.json' },
   serviceATermsRemoved: { path: './fixtures/serviceATermsRemoved.json' },
@@ -23,6 +24,7 @@ const FIXTURES = {
 
 const COMMIT_PATHS = {
   serviceA: './declarations/ServiceA.json',
+  serviceAHistory: './declarations/ServiceA.history.json',
   serviceB: './declarations/ServiceB.json',
 };
 
@@ -36,7 +38,7 @@ const removeLatestCommit = async () => {
   await declarationUtils.git.reset('hard', ['HEAD~1']);
 };
 
-describe.only('DeclarationUtils', () => {
+describe('DeclarationUtils', () => {
   describe('#getModifiedServicesAndTermsTypes', () => {
     before(async () => {
       await loadFixtures();
@@ -46,8 +48,14 @@ describe.only('DeclarationUtils', () => {
     after(() => fs.rm(SUBJECT_PATH, { recursive: true }));
 
     context('when an existing declaration has been modified', () => {
-      before(() => commitChanges(COMMIT_PATHS.serviceA, FIXTURES.serviceATermsUpdated.content));
-      after(removeLatestCommit);
+      before(async () => {
+        await commitChanges(COMMIT_PATHS.serviceA, FIXTURES.serviceATermsUpdated.content);
+        await commitChanges(COMMIT_PATHS.serviceAHistory, FIXTURES.serviceATermsUpdatedHistory.content);
+      });
+      after(async () => {
+        await removeLatestCommit();
+        await removeLatestCommit();
+      });
 
       it('returns the service ID and the updated terms type', async () => {
         expect(await declarationUtils.getModifiedServicesAndTermsTypes()).to.deep.equal({
@@ -82,7 +90,7 @@ describe.only('DeclarationUtils', () => {
     });
 
     context('when a declaration has been removed', () => {
-      before(() => removeLatestCommit(declarationUtils.git));
+      before(removeLatestCommit);
       after(async () => {
         await fs.mkdir(path.resolve(SUBJECT_PATH, './declarations'), { recursive: true });
         await commitChanges(COMMIT_PATHS.serviceA, FIXTURES.serviceA.content);

package/scripts/declarations/validate/index.mocha.js

@@ -41,7 +41,7 @@ export default async options => {
   }
 
   describe('Service declarations validation', async function () {
-    this.timeout(30000);
+    this.timeout(60000);
     this.slow(SLOW_DOCUMENT_THRESHOLD);
 
     servicesToValidate.forEach(serviceId => {

package/src/archivist/fetcher/index.test.js

@@ -20,7 +20,7 @@ const termsHTML = '<!DOCTYPE html><html><head><meta charset="UTF-8"><title>First
 const termsWithOtherCharsetHTML = '<!DOCTYPE html><html><head><meta http-equiv="Content-Type" content="text/html; charset=windows-1251"><title>TOS на първия доставчик</title></head><body><h1>Условия за ползване</h1><p>Dapibus quis diam sagittis</p></body></html>';
 
 describe('Fetcher', function () {
-  this.timeout(10000);
+  this.timeout(60000);
 
   before(launchHeadlessBrowser);