chore: cleanup and leverage await rather than timeouts

Author: maverick1872

README.md

@@ -1234,13 +1234,16 @@ yarn add winston
 
 ## Run Tests
 
-All of the winston tests are written with [`mocha`][mocha], [`nyc`][nyc], and
-[`assume`][assume].  They can be run with `npm`.
-
 ``` bash
-npm test
+npm test # Runs all tests
+npm run test:unit # Runs all Unit tests with coverage
+npm run test:test # Runs all integration tests
+npm run test:test # Runs all integration tests
+npm run typescript:test # Runs tests verifying Typescript types
 ```
 
+All of the winston tests are written with [`jest`][jest]. Assertions use a mix of [`assume`][assume] and the built-in jest assertion library.
+
 #### Author: [Charlie Robbins]
 #### Contributors: [Jarrett Cruger], [David Hyde], [Chris Alderson]
 
@@ -1254,8 +1257,6 @@ npm test
 
 [RFC5424]: https://tools.ietf.org/html/rfc5424
 [util.format]: https://nodejs.org/dist/latest/docs/api/util.html#util_util_format_format_args
-[mocha]: https://mochajs.org
-[nyc]: https://github.com/istanbuljs/nyc
 [assume]: https://github.com/bigpipe/assume
 [logform]: https://github.com/winstonjs/logform#readme
 [winston-transport]: https://github.com/winstonjs/winston-transport
@@ -1268,4 +1269,4 @@ npm test
 [Charlie Robbins]: http://github.com/indexzero
 [Jarrett Cruger]: https://github.com/jcrugzz
 [David Hyde]: https://github.com/dabh
-[Chris Alderson]: https://github.com/chrisalderson
+[Chris Alderson]: https://github.com/chrisalderson

test/unit/winston/transports/00-file-stress.test.js

@@ -150,7 +150,7 @@ describe('File (stress)', function () {
         });
     }, 10000);
   });
-  
+
   it('should handle a high volume of writes with lazy option enabled', function (done) {
     const logger = winston.createLogger({
       transports: [

test/unit/winston/transports/file.test.js

@@ -10,8 +10,8 @@ const testLogFixturesPath = path.join(__dirname, '..', '..', '..', 'fixtures', '
 
 const { MESSAGE } = require('triple-beam');
 
-function removeFixtures() {
-  rimraf(path.join(testLogFixturesPath, 'test*'), { glob: true });
+async function removeFixtures() {
+  await rimraf(path.join(testLogFixturesPath, 'test*'), { glob: true });
 }
 function getFilePath(filename) {
   return path.join(testLogFixturesPath, filename);
@@ -55,16 +55,15 @@ describe('File Transport', function () {
       const logPayload = { level: 'info', [MESSAGE]: kbStr };
       transport.log(logPayload);
     }
-    await new Promise(resolve => setTimeout(resolve, 50));
+    await new Promise(resolve => setTimeout(resolve, 100));
   }
-  beforeEach(() => {
-    removeFixtures();
+
+  beforeEach(async () => {
+    await removeFixtures();
   });
 
   afterEach(async () => {
-    removeFixtures();
-    // Allow time for file system operations to complete
-    await new Promise(resolve => setTimeout(resolve, 500));
+    await removeFixtures();
   });
 
   describe('Filename Option', function () {
@@ -92,8 +91,6 @@ describe('File Transport', function () {
 
       await logKbytesToTransport(transport, 4);
 
-      await new Promise(resolve => setTimeout(resolve, 50));
-
       assertFileExists('testarchive.log');
       assertFileExists('testarchive_.log');
     });
@@ -151,9 +148,6 @@ describe('File Transport', function () {
       await logKbytesToTransport(transport, 4, 'B');
       await logKbytesToTransport(transport, 4, 'C');
 
-      // Give file system operations time to complete archiving
-      await new Promise(resolve => setTimeout(resolve, 500));
-
       // Verify the expected files exist and their contents are correct
       assertFileExists('testarchive.log');
       assertFileExists('testarchive1.log');
@@ -164,7 +158,7 @@ describe('File Transport', function () {
       assertFileContentsStartWith('testarchive.log');
       assertFileContentsStartWith('testarchive1.log', 'C');
       assertFileContentsStartWith('testarchive2.log', 'B');
-      // TODO: I would expect the first file that was rolled to be filled with the first log message
+      // FIX: I would expect the first file that was rolled to be filled with the first log message
       // assertFileContentsStartWith('testarchive3.log', 'A');
     });
 
@@ -179,9 +173,6 @@ describe('File Transport', function () {
       await logKbytesToTransport(transport, 4, 'B');
       await logKbytesToTransport(transport, 4, 'C');
 
-      // Give file system operations time to complete archiving
-      await new Promise(resolve => setTimeout(resolve, 500));
-
       // Verify the expected files exist
       assertFileExists('testarchive.log');
       assertFileExists('testarchive1.log');
@@ -190,7 +181,7 @@ describe('File Transport', function () {
 
       // Verify the contents of the files are in the expected order
       assertFileContentsStartWith('testarchive.log');
-      // TODO: only two of the files are filled and are not in the expected order
+      // FIX: only two of the files are filled and are not in the expected order
       // assertFileContentsStartWith('testarchive1.log', 'A');
       // assertFileContentsStartWith('testarchive2.log', 'B');
       // assertFileContentsStartWith('testarchive3.log', 'C');
@@ -232,7 +223,7 @@ describe('File Transport', function () {
   });
 
 
-  // TODO: Rewrite these tests in mocha
+  // TODO: Reintroduce these tests
   //
   // "Error object in metadata #610": {
   //   topic: function () {