@opentermsarchive/engine 1.2.1 → 1.3.0

package/src/archivist/recorder/repositories/mongo/index.test.js

@@ -81,7 +81,7 @@ describe('MongoRepository', () => {
           }));
         });
 
-        after(async () => subject.removeAll());
+        after(() => subject.removeAll());
 
         it('saves the record', () => {
           expect(numberOfRecordsAfter).to.equal(numberOfRecordsBefore + 1);
@@ -156,7 +156,7 @@ describe('MongoRepository', () => {
           }).limit(1).sort({ created_at: -1 }).toArray());
         });
 
-        after(async () => subject.removeAll());
+        after(() => subject.removeAll());
 
         it('saves the record', () => {
           expect(numberOfRecordsAfter).to.equal(numberOfRecordsBefore + 1);
@@ -200,7 +200,7 @@ describe('MongoRepository', () => {
           }).count();
         });
 
-        after(async () => subject.removeAll());
+        after(() => subject.removeAll());
 
         it('does not save the record', () => {
           expect(numberOfRecordsAfter).to.equal(numberOfRecordsBefore);
@@ -248,7 +248,7 @@ describe('MongoRepository', () => {
           }).limit(1).sort({ created_at: -1 }).toArray());
         });
 
-        after(async () => subject.removeAll());
+        after(() => subject.removeAll());
 
         it('saves the record', () => {
           expect(numberOfRecordsAfter).to.equal(numberOfRecordsBefore + 1);
@@ -279,7 +279,7 @@ describe('MongoRepository', () => {
           }));
         });
 
-        after(async () => subject.removeAll());
+        after(() => subject.removeAll());
 
         it('stores snapshot ID', () => {
           const snapshotIds = mongoDocument.snapshotIds.map(id => id.toString());
@@ -315,7 +315,7 @@ describe('MongoRepository', () => {
           }));
         });
 
-        after(async () => subject.removeAll());
+        after(() => subject.removeAll());
 
         it('stores snapshots IDs', () => {
           const snapshotIds = mongoDocument.snapshotIds.map(id => id.toString());
@@ -350,7 +350,7 @@ describe('MongoRepository', () => {
         (record = await subject.findById(id));
       });
 
-      after(async () => subject.removeAll());
+      after(() => subject.removeAll());
 
       it('returns a Version object', () => {
         expect(record).to.be.an.instanceof(Version);
@@ -372,7 +372,7 @@ describe('MongoRepository', () => {
         expect(record.termsType).to.equal(TERMS_TYPE);
       });
 
-      it('returns the content', async () => {
+      it('returns the content', () => {
         expect(record.content).to.equal(CONTENT);
       });
 
@@ -429,7 +429,7 @@ describe('MongoRepository', () => {
             recordFound = await subject.findByDate(SERVICE_PROVIDER_ID, TERMS_TYPE, oneHourBeforeFetchDateLater);
           });
 
-          after(async () => subject.removeAll());
+          after(() => subject.removeAll());
 
           it('returns a Version object', () => {
             expect(recordFound).to.be.an.instanceof(Version);
@@ -481,7 +481,7 @@ describe('MongoRepository', () => {
         (records = await subject.findAll());
       });
 
-      after(async () => subject.removeAll());
+      after(() => subject.removeAll());
 
       it('returns all records', () => {
         expect(records.length).to.equal(3);
@@ -493,7 +493,7 @@ describe('MongoRepository', () => {
         }
       });
 
-      it('returns records in ascending order', async () => {
+      it('returns records in ascending order', () => {
         expect(records.map(record => record.fetchDate)).to.deep.equal([ FETCH_DATE_EARLIER, FETCH_DATE, FETCH_DATE_LATER ]);
       });
     });
@@ -528,9 +528,9 @@ describe('MongoRepository', () => {
         (count = await subject.count());
       });
 
-      after(async () => subject.removeAll());
+      after(() => subject.removeAll());
 
-      it('returns the proper count', async () => {
+      it('returns the proper count', () => {
         expect(count).to.equal(3);
       });
     });
@@ -566,7 +566,7 @@ describe('MongoRepository', () => {
             );
           });
 
-          after(async () => subject.removeAll());
+          after(() => subject.removeAll());
 
           it('returns a Version object', () => {
             expect(latestRecord).to.be.an.instanceof(Version);
@@ -589,7 +589,7 @@ describe('MongoRepository', () => {
           latestRecord = await subject.findLatest(SERVICE_PROVIDER_ID, TERMS_TYPE);
         });
 
-        it('returns null', async () => {
+        it('returns null', () => {
           expect(latestRecord).to.equal(null);
         });
       });
@@ -638,13 +638,13 @@ describe('MongoRepository', () => {
         }
       });
 
-      after(async () => subject.removeAll());
+      after(() => subject.removeAll());
 
-      it('iterates through all records', async () => {
+      it('iterates through all records', () => {
         expect(ids).to.have.members(expectedIds);
       });
 
-      it('iterates in ascending order', async () => {
+      it('iterates in ascending order', () => {
         expect(fetchDates).to.deep.equal([ FETCH_DATE_EARLIER, FETCH_DATE, FETCH_DATE_LATER ]);
       });
     });
@@ -693,7 +693,7 @@ describe('MongoRepository', () => {
           }));
         });
 
-        after(async () => subject.removeAll());
+        after(() => subject.removeAll());
 
         it('saves the record', () => {
           expect(numberOfRecordsAfter).to.equal(numberOfRecordsBefore + 1);
@@ -772,7 +772,7 @@ describe('MongoRepository', () => {
           }).limit(1).sort({ created_at: -1 }).toArray());
         });
 
-        after(async () => subject.removeAll());
+        after(() => subject.removeAll());
 
         it('saves the record', () => {
           expect(numberOfRecordsAfter).to.equal(numberOfRecordsBefore + 1);
@@ -816,7 +816,7 @@ describe('MongoRepository', () => {
           }).count();
         });
 
-        after(async () => subject.removeAll());
+        after(() => subject.removeAll());
 
         it('does not save the record', () => {
           expect(numberOfRecordsAfter).to.equal(numberOfRecordsBefore);
@@ -855,7 +855,7 @@ describe('MongoRepository', () => {
           }));
         });
 
-        after(async () => subject.removeAll());
+        after(() => subject.removeAll());
 
         it('saves the record', () => {
           expect(numberOfRecordsAfter).to.equal(numberOfRecordsBefore + 1);
@@ -865,7 +865,7 @@ describe('MongoRepository', () => {
           expect(mongoDocument._id.toString()).to.equal(record.id);
         });
 
-        it('stores the proper content', async () => {
+        it('stores the proper content', () => {
           const isSameContent = Buffer.compare(mongoDocument.content.buffer, PDF_CONTENT) == 0;
 
           expect(isSameContent).to.be.true;
@@ -894,7 +894,7 @@ describe('MongoRepository', () => {
         (record = await subject.findById(id));
       });
 
-      after(async () => subject.removeAll());
+      after(() => subject.removeAll());
 
       it('returns a Snapshot object', () => {
         expect(record).to.be.an.instanceof(Snapshot);
@@ -916,7 +916,7 @@ describe('MongoRepository', () => {
         expect(record.termsType).to.equal(TERMS_TYPE);
       });
 
-      it('returns the content', async () => {
+      it('returns the content', () => {
         expect(record.content).to.equal(CONTENT);
       });
 
@@ -978,7 +978,7 @@ describe('MongoRepository', () => {
         (records = await subject.findAll());
       });
 
-      after(async () => subject.removeAll());
+      after(() => subject.removeAll());
 
       it('returns all records', () => {
         expect(records.length).to.equal(3);
@@ -990,7 +990,7 @@ describe('MongoRepository', () => {
         }
       });
 
-      it('returns records in ascending order', async () => {
+      it('returns records in ascending order', () => {
         expect(records.map(record => record.fetchDate)).to.deep.equal([ FETCH_DATE_EARLIER, FETCH_DATE, FETCH_DATE_LATER ]);
       });
     });
@@ -1025,9 +1025,9 @@ describe('MongoRepository', () => {
         (count = await subject.count());
       });
 
-      after(async () => subject.removeAll());
+      after(() => subject.removeAll());
 
-      it('returns the proper count', async () => {
+      it('returns the proper count', () => {
         expect(count).to.equal(3);
       });
     });
@@ -1063,7 +1063,7 @@ describe('MongoRepository', () => {
             );
           });
 
-          after(async () => subject.removeAll());
+          after(() => subject.removeAll());
 
           it('returns a Snapshot object', () => {
             expect(latestRecord).to.be.an.instanceof(Snapshot);
@@ -1103,13 +1103,13 @@ describe('MongoRepository', () => {
             latestRecord = await subject.findLatest(SERVICE_PROVIDER_ID, TERMS_TYPE);
           });
 
-          after(async () => subject.removeAll());
+          after(() => subject.removeAll());
 
           it('returns the latest record id', () => {
             expect(latestRecord.id).to.include(lastSnapshotId);
           });
 
-          it('returns the latest record content', async () => {
+          it('returns the latest record content', () => {
             const isSameContent = Buffer.compare(latestRecord.content, UPDATED_PDF_CONTENT) == 0;
 
             expect(isSameContent).to.be.true;
@@ -1128,7 +1128,7 @@ describe('MongoRepository', () => {
           latestRecord = await subject.findLatest(SERVICE_PROVIDER_ID, TERMS_TYPE);
         });
 
-        it('returns null', async () => {
+        it('returns null', () => {
           expect(latestRecord).to.equal(null);
         });
       });
@@ -1177,13 +1177,13 @@ describe('MongoRepository', () => {
         }
       });
 
-      after(async () => subject.removeAll());
+      after(() => subject.removeAll());
 
-      it('iterates through all records', async () => {
+      it('iterates through all records', () => {
         expect(ids).to.have.members(expectedIds);
       });
 
-      it('iterates in ascending order', async () => {
+      it('iterates in ascending order', () => {
         expect(fetchDates).to.deep.equal([ FETCH_DATE_EARLIER, FETCH_DATE, FETCH_DATE_LATER ]);
       });
     });

package/src/archivist/recorder/snapshot.test.js

@@ -20,14 +20,14 @@ describe('Snapshot', () => {
 
       describe(`"${requiredParam}"`, () => {
         context('when missing', () => {
-          it('throws an error', async () => {
+          it('throws an error', () => {
             subject = new Snapshot({ ...validParamsExceptTheOneTested });
             expect(subject.validate.bind(subject)).to.throw(RegExp(requiredParam));
           });
         });
 
         context('when null', () => {
-          it('throws an error', async () => {
+          it('throws an error', () => {
             subject = new Snapshot({ ...validParamsExceptTheOneTested, [requiredParam]: null });
             expect(subject.validate.bind(subject)).to.throw(RegExp(requiredParam));
           });
@@ -44,12 +44,12 @@ describe('Snapshot', () => {
       fetchDate: new Date('2000-01-01T12:00:00.000Z'),
     };
 
-    before(async () => {
+    before(() => {
       subject = new Snapshot(recordParams);
     });
 
     context('when it is neither defined nor loaded', () => {
-      it('throws an error explaining how to recover', async () => {
+      it('throws an error explaining how to recover', () => {
         try {
           console.log(subject.content);
         } catch (e) {

package/src/archivist/recorder/version.test.js

@@ -20,14 +20,14 @@ describe('Version', () => {
 
       describe(`"${requiredParam}"`, () => {
         context('when missing', () => {
-          it('throws an error', async () => {
+          it('throws an error', () => {
             subject = new Version({ ...validParamsExceptTheOneTested });
             expect(subject.validate.bind(subject)).to.throw(RegExp(requiredParam));
           });
         });
 
         context('when null', () => {
-          it('throws an error', async () => {
+          it('throws an error', () => {
             subject = new Version({ ...validParamsExceptTheOneTested, [requiredParam]: null });
             expect(subject.validate.bind(subject)).to.throw(RegExp(requiredParam));
           });
@@ -44,12 +44,12 @@ describe('Version', () => {
       snapshotIds: ['dd263f270b3065e1c18201b49ab898474b357566'],
     };
 
-    before(async () => {
+    before(() => {
       subject = new Version(recordParams);
     });
 
     context('when it is neither defined nor loaded', () => {
-      it('throws an error explaining how to recover', async () => {
+      it('throws an error explaining how to recover', () => {
         try {
           console.log(subject.content);
         } catch (e) {

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

@@ -12,7 +12,7 @@ describe('Services', () => {
   describe('#load', () => {
     let result;
 
-    async function validateServiceWithoutHistory(serviceId, expected) {
+    function validateServiceWithoutHistory(serviceId, expected) {
       /* eslint-disable no-loop-func */
       for (const termsType of expected.getTermsTypes()) {
         context(`${termsType}`, () => {
@@ -59,20 +59,20 @@ describe('Services', () => {
                 expect(actualTerms.validUntil).to.be.undefined;
               });
 
-              it('has the proper content selectors', async () => {
+              it('has the proper content selectors', () => {
                 expect(actualContentSelectors).to.equal(expectedContentSelectors);
               });
 
-              it('has the proper insignificant content selectors', async () => {
+              it('has the proper insignificant content selectors', () => {
                 expect(actualInsignificantContentSelectors).to.equal(expectedInsignificantContentSelectors);
               });
 
-              it('has the proper executeClientScripts option', async () => {
+              it('has the proper executeClientScripts option', () => {
                 expect(actualExecuteClientScripts).to.equal(expectedExecuteClientScripts);
               });
 
               if (expectedFilters) {
-                it('has the proper number of filter functions', async () => {
+                it('has the proper number of filter functions', () => {
                   expect(actualFilters.length).to.equal(expectedFilters.length);
                 });
 
@@ -125,12 +125,12 @@ describe('Services', () => {
       await validateServiceWithoutHistory('service_with_multiple_source_documents_terms', expectedServices.service_with_multiple_source_documents_terms);
     });
 
-    context('when specifying services to load', async () => {
+    context('when specifying services to load', () => {
       before(async () => {
         result = await services.load([ 'service·A', 'Service B!' ]);
       });
 
-      it('loads only the given services', async () => {
+      it('loads only the given services', () => {
         expect(result).to.have.all.keys('service·A', 'Service B!');
       });
     });
@@ -139,7 +139,7 @@ describe('Services', () => {
   describe('#loadWithHistory', () => {
     let result;
 
-    async function validateServiceWithHistory(serviceId, expected) {
+    function validateServiceWithHistory(serviceId, expected) {
       /* eslint-disable no-loop-func */
       for (const termsType of expected.getTermsTypes()) {
         context(`${termsType}`, () => {
@@ -201,20 +201,20 @@ describe('Services', () => {
                       } = actualDocumentsForThisDate[index]);
                     });
 
-                    it('has the proper content selectors', async () => {
+                    it('has the proper content selectors', () => {
                       expect(contentSelectorsForThisDate).to.equal(expectedContentSelectors);
                     });
 
-                    it('has the proper insignificant content selectors', async () => {
+                    it('has the proper insignificant content selectors', () => {
                       expect(insignificantContentSelectorsForThisDate).to.equal(expectedInsignificantContentSelectors);
                     });
 
-                    it('has the proper executeClientScripts option', async () => {
+                    it('has the proper executeClientScripts option', () => {
                       expect(actualExecuteClientScriptsForThisDate).to.equal(expectedExecuteClientScriptsForThisDate);
                     });
 
                     if (expectedFiltersForThisDate) {
-                      it('has the proper number of filter functions', async () => {
+                      it('has the proper number of filter functions', () => {
                         expect(actualFiltersForThisDate.length).to.equal(expectedFiltersForThisDate.length);
                       });
 
@@ -231,12 +231,12 @@ describe('Services', () => {
                   });
                 }
               } else {
-                it('has no history', async () => {
+                it('has no history', () => {
                   expect(actualTerms.validUntil).to.be.undefined;
                 });
 
                 if (expectedFilters) {
-                  it('has the proper number of filter functions', async () => {
+                  it('has the proper number of filter functions', () => {
                     expect(actualFilters.length).to.equal(expectedFilters.length);
                   });
 
@@ -294,12 +294,12 @@ describe('Services', () => {
       await validateServiceWithHistory('service_with_multiple_source_documents_terms', expectedServices.service_with_multiple_source_documents_terms);
     });
 
-    context('when specifying services to load', async () => {
+    context('when specifying services to load', () => {
       before(async () => {
         result = await services.loadWithHistory([ 'service·A', 'Service B!' ]);
       });
 
-      it('loads only the given services', async () => {
+      it('loads only the given services', () => {
         expect(result).to.have.all.keys('service·A', 'Service B!');
       });
     });

package/src/archivist/services/sourceDocument.test.js

@@ -10,7 +10,7 @@ describe('SourceDocument', () => {
   describe('#getCssSelectors', () => {
     context('with "select" property', () => {
       context('with string selector', () => {
-        it('extracts selectors', async () => {
+        it('extracts selectors', () => {
           const result = new SourceDocument({ location: URL, contentSelectors: 'body' }).cssSelectors;
 
           expect(result).to.deep.equal(['body']);
@@ -18,7 +18,7 @@ describe('SourceDocument', () => {
       });
 
       context('with range selector', () => {
-        it('extracts selectors', async () => {
+        it('extracts selectors', () => {
           const result = new SourceDocument({
             location: URL,
             contentSelectors: {
@@ -32,7 +32,7 @@ describe('SourceDocument', () => {
       });
 
       context('with an array of mixed selectors', () => {
-        it('extracts selectors', async () => {
+        it('extracts selectors', () => {
           const result = new SourceDocument({
             location: URL,
             contentSelectors: [
@@ -51,7 +51,7 @@ describe('SourceDocument', () => {
 
     context('with "remove" property', () => {
       context('with string selector', () => {
-        it('extracts selectors', async () => {
+        it('extracts selectors', () => {
           const result = new SourceDocument({ location: URL, insignificantContentSelectors: 'body' }).cssSelectors;
 
           expect(result).to.deep.equal(['body']);
@@ -59,7 +59,7 @@ describe('SourceDocument', () => {
       });
 
       context('with range selector', () => {
-        it('extracts selectors', async () => {
+        it('extracts selectors', () => {
           const result = new SourceDocument({
             location: URL,
             insignificantContentSelectors: {
@@ -73,7 +73,7 @@ describe('SourceDocument', () => {
       });
 
       context('with an array of mixed selectors', () => {
-        it('extracts selectors', async () => {
+        it('extracts selectors', () => {
           const result = new SourceDocument({
             location: URL,
             insignificantContentSelectors: [
@@ -92,7 +92,7 @@ describe('SourceDocument', () => {
 
     context('with both "select" and "remove" property', () => {
       context('with string selector', () => {
-        it('extracts selectors', async () => {
+        it('extracts selectors', () => {
           const result = new SourceDocument({
             location: URL,
             contentSelectors: 'body',
@@ -104,7 +104,7 @@ describe('SourceDocument', () => {
       });
 
       context('with range selector', () => {
-        it('extracts selectors', async () => {
+        it('extracts selectors', () => {
           const result = new SourceDocument({
             location: URL,
             contentSelectors: {
@@ -127,7 +127,7 @@ describe('SourceDocument', () => {
       });
 
       context('with an array of mixed selectors', () => {
-        it('extracts selectors', async () => {
+        it('extracts selectors', () => {
           const result = new SourceDocument({
             location: URL,
             contentSelectors: [
@@ -160,7 +160,7 @@ describe('SourceDocument', () => {
   });
 
   describe('#toPersistence', () => {
-    it('converts basic source document declarations into JSON representation', async () => {
+    it('converts basic source document declarations into JSON representation', () => {
       const result = new SourceDocument({
         location: URL,
         contentSelectors: 'body',
@@ -177,7 +177,7 @@ describe('SourceDocument', () => {
       expect(result).to.deep.equal(expectedResult);
     });
 
-    it('converts full source document declarations to JSON representation', async () => {
+    it('converts full source document declarations to JSON representation', () => {
       const result = new SourceDocument({
         location: URL,
         contentSelectors: [

package/src/archivist/services/terms.test.js

@@ -60,7 +60,7 @@ describe('Terms', () => {
   };
 
   describe('#toPersistence', () => {
-    it('converts terms with single source document to JSON representation', async () => {
+    it('converts terms with single source document to JSON representation', () => {
       const result = new Terms({ service, type: termsType, sourceDocuments: [document1] }).toPersistence();
 
       const expectedResult = {
@@ -71,7 +71,7 @@ describe('Terms', () => {
       expect(result).to.deep.equal(expectedResult);
     });
 
-    it('converts terms with multiple source documents to JSON representation', async () => {
+    it('converts terms with multiple source documents to JSON representation', () => {
       const result = new Terms({ service, type: termsType, sourceDocuments: [ document1, document2 ] }).toPersistence();
 
       const expectedResult = {

package/src/notifier/index.js

@@ -17,11 +17,11 @@ export default class Notifier {
     this.delayedVersionNotificationsParams = [];
   }
 
-  async onVersionRecorded(record) {
+  onVersionRecorded(record) {
     this.delayedVersionNotificationsParams.push(record);
   }
 
-  async onTrackingCompleted() {
+  onTrackingCompleted() {
     this.delayedVersionNotificationsParams.forEach(async ({ serviceId, termsType, id }) => {
       try {
         await this.notifyVersionRecorded(serviceId, termsType, id);