Change test:all to clean up each example after running it (#145)

GantMan · Oct 19, 2019 · 34e5d8c · 34e5d8c
1 parent 59f5195
commit 34e5d8c
Show file tree

Hide file tree

Showing 4 changed files with 88 additions and 91 deletions.
diff --git a/test/modules_test/index.js b/test/modules_test/index.js
@@ -4,15 +4,15 @@
 const bluebird = require( 'bluebird' );
 
 const {
-    
+
     getDirectories,
 
     constants: {
 
         TEMPORARY_TEST_FILES
     }
 
-} = require( '../utils' ); 
+} = require( '../utils' );
 
 const testReactDirectory = require( './test_react_directory' );
 
@@ -25,11 +25,6 @@ describe( 'Modules Test', function() {
 
     this.timeout( Infinity );
 
-    before( function() {
-
-        return removeTemporaryTestFiles();
-    });
-
     [
         {
             title: 'Each React module passes test',
@@ -60,9 +55,9 @@ describe( 'Modules Test', function() {
         it( title, function() {
 
             return getDirectories({
-                
+
                 path: pathForLibraries
-            
+
             }).then( directories => {
 
                 // NOTE: used to run test on single directory
@@ -78,25 +73,25 @@ describe( 'Modules Test', function() {
             }).then( testResults => {
 
                 console.log(
-                    
+
                     'Results:',
-                    
+
                     JSON.stringify( testResults, null, 4 )
                 );
 
                 const errorDirectories = testResults.filter(
-                    
+
                     result => !!result.error
 
                 ).map(
-                    
+
                     errorResult => errorResult.directory
                 );
 
                 if( errorDirectories.length > 0 ) {
 
                     throw new Error(
-                        
+
                         `${ pathForLibraries } libraries that ` +
                         `failed the test: ` +
                         JSON.stringify( errorDirectories )
@@ -106,31 +101,3 @@ describe( 'Modules Test', function() {
         });
     });
 });
-
-
-// helper functions
-function removeTemporaryTestFiles() {
-
-    console.log( 'removing existing temporary test files' );
-
-    return execa(
-
-        'rm', 
-
-        [
-            '-rf',
-            TEMPORARY_TEST_FILES,
-        ],
-
-        {
-            cwd: `${ process.cwd() }/test`
-        }
-
-    ).then( () => {
-
-        console.log(
-
-            'successfully removed existing temporary test files'
-        );
-    });
-}
diff --git a/test/modules_test/test_react_directory.js b/test/modules_test/test_react_directory.js
@@ -2,30 +2,34 @@
 /* jshint expr: true */
 
 const {
-
+
+    makeDirectoryCleanupFunction,
+
     constants: {
 
         TEMPORARY_TEST_FILES
     }
 
-} = require( '../utils' ); 
+} = require( '../utils' );
 
 const execa = require( 'execa' );
 
 
 module.exports = ({ directory }) => {
 
     const testDirectory = (
-        
+
         `test/${ TEMPORARY_TEST_FILES }/React/${ directory }/`
     );
 
     const fullTestDirectoryPath = `${ process.cwd() }/${ testDirectory }`;
 
     let stage = 'start';
 
+    const finallyRemoveTemporaryDirectory = makeDirectoryCleanupFunction(testDirectory);
+
     return execa(
-        
+
         'mkdir',
 
         [
@@ -38,32 +42,32 @@ module.exports = ({ directory }) => {
         stage = 'copy';
 
         return execa(
-        
+
             'cp',
-    
+
             [
                 '-a',
                 `React/${ directory }/.`,
                 testDirectory,
             ]
         );
-    
+
     }).then( () => {
 
         stage = 'yarn';
-        
+
         console.log( `running yarn in ${ testDirectory }` );
 
         return execa(
-        
+
             'yarn',
 
             [],
 
             {
                 cwd: fullTestDirectoryPath
             }
-        );  
+        );
 
     }).then( () => {
 
@@ -72,7 +76,7 @@ module.exports = ({ directory }) => {
         console.log( `running yarn build in ${ testDirectory }` );
 
         return execa(
-        
+
             'yarn',
 
             [
@@ -82,7 +86,7 @@ module.exports = ({ directory }) => {
             {
                 cwd: fullTestDirectoryPath
             }
-        );  
+        );
 
     }).then( () => {
 
@@ -91,8 +95,8 @@ module.exports = ({ directory }) => {
         console.log( `running CI=true yarn test in ${ testDirectory }` );
 
         return execa(
-        
-            'yarn', 
+
+            'yarn',
 
             [
                 'test'
@@ -104,16 +108,16 @@ module.exports = ({ directory }) => {
                     CI: true
                 }
             }
-        );  
+        );
 
     }).then( () => {
-        
+
         stage = 'finish';
 
         console.log( `${ directory } passed test` );
-        
+
         return {
-    
+
             directory,
             passedTests: true,
             // data: result.stdout
@@ -124,10 +128,10 @@ module.exports = ({ directory }) => {
         console.log( `${ directory } failed test at stage: ${ stage }` );
 
         return {
-            
+
             passedTests: false,
             directory,
             error: err
         };
-    });
-};
+    }).then(finallyRemoveTemporaryDirectory, finallyRemoveTemporaryDirectory);
+};
diff --git a/test/modules_test/test_react_native_directory.js b/test/modules_test/test_react_native_directory.js
@@ -2,30 +2,34 @@
 /* jshint expr: true */
 
 const {
-
+
+    makeDirectoryCleanupFunction,
+
     constants: {
 
         TEMPORARY_TEST_FILES
     }
 
-} = require( '../utils' ); 
+} = require( '../utils' );
 
 const execa = require( 'execa' );
 
 
 module.exports = ({ directory }) => {
 
     const testDirectory = (
-        
+
         `test/${ TEMPORARY_TEST_FILES }/ReactNative/${ directory }/`
     );
 
     const fullTestDirectoryPath = `${ process.cwd() }/${ testDirectory }`;
 
     let stage = 'start';
 
+    const finallyRemoveTemporaryDirectory = makeDirectoryCleanupFunction(testDirectory);
+
     return execa(
-        
+
         'mkdir',
 
         [
@@ -38,24 +42,24 @@ module.exports = ({ directory }) => {
         stage = 'copy';
 
         return execa(
-        
+
             'cp',
-    
+
             [
                 '-a',
                 `ReactNative/${ directory }/.`,
                 testDirectory,
             ]
         );
-    
+
     }).then( () => {
 
         stage = 'npm install';
 
         console.log( `running npm install in ${ testDirectory }` );
-        
+
         return execa(
-        
+
             'npm',
 
             [
@@ -66,7 +70,7 @@ module.exports = ({ directory }) => {
                 cwd: fullTestDirectoryPath
             }
         );
-    
+
     }).then( () => {
 
         stage = 'ios';
@@ -95,7 +99,7 @@ module.exports = ({ directory }) => {
             {
                 cwd: fullTestDirectoryPath
             }
-        );  
+        );
 
     }).then( () => {
 
@@ -104,7 +108,7 @@ module.exports = ({ directory }) => {
         console.log( `running android command in ${ testDirectory }` );
 
         return execa(
-        
+
             'react-native',
 
             [
@@ -125,16 +129,16 @@ module.exports = ({ directory }) => {
             {
                 cwd: fullTestDirectoryPath
             }
-        );  
+        );
 
     }).then( () => {
-        
+
         stage = 'finish';
 
         console.log( `${ directory } passed test` );
-        
+
         return {
-    
+
             directory,
             passedTests: true,
             // data: result.stdout
@@ -145,10 +149,10 @@ module.exports = ({ directory }) => {
         console.log( `${ directory } failed test at stage: ${ stage }` );
 
         return {
-            
+
             passedTests: false,
             directory,
             error: err
         };
-    });
-};
+    }).then(finallyRemoveTemporaryDirectory, finallyRemoveTemporaryDirectory);
+};