Merge pull request #519 from mjbvz/lazy-generatescopes

Move generateScopes into `it` for tests

Author: sheetalkamat

tests/test.ts

@@ -21,28 +21,39 @@ ensureCleanGeneratedFolder();
 
 // Generate the new baselines
 for (const fileName of fs.readdirSync('cases')) {
+    const text = fs.readFileSync(path.join('./cases', fileName), 'utf8');
+    const parsedFileName = path.parse(fileName);
+
+    let wholeBaseline: string;
+    let markerScopes: string;
+
     describe("Generating baseline for " + fileName, () => {
-        const text = fs.readFileSync(path.join('./cases', fileName), 'utf8');
-        const parsedFileName = path.parse(fileName);
-        const { markerScopes, wholeBaseline } = build.generateScopes(text, parsedFileName);
-        if (markerScopes) {
-            addTestCase(parsedFileName.name + '.txt', markerScopes);
-        }
-        addTestCase(parsedFileName.name + '.baseline.txt', wholeBaseline);
+        before(() =>  {
+            const result = build.generateScopes(text, parsedFileName)
+            wholeBaseline = result.wholeBaseline;
+            markerScopes = result.markerScopes;
+        });
+
+        it('Comparing generated', () => {
+            assertBaselinesMatch(parsedFileName.name + '.baseline.txt', wholeBaseline);
+        });
+
+        it('Comparing generated scopes', () => {
+            if (markerScopes) {
+                assertBaselinesMatch(parsedFileName.name + '.txt', markerScopes);
+            }
+        });
     });
 }
 
-function addTestCase(file: string, generatedText: string) {
+function assertBaselinesMatch(file: string, generatedText: string) {
     const generatedFileName = path.join(generatedFolder, file);
     fs.writeFileSync(generatedFileName, generatedText);
 
-    it('Comparing generated' + file, () => {
-        const baselineFile = path.join(baselineFolder, file);
-        if (fs.existsSync(baselineFile)) {
-            chai.assert.equal(generatedText, fs.readFileSync(baselineFile, 'utf8'), "Expected baselines to match");
-        }
-        else {
-            chai.assert(false, "New generated baseline");
-        }
-    });
+    const baselineFile = path.join(baselineFolder, file);
+    if (fs.existsSync(baselineFile)) {
+        chai.assert.equal(generatedText, fs.readFileSync(baselineFile, 'utf8'), "Expected baselines to match: " + file);
+    } else {
+        chai.assert(false, "New generated baseline");
+    }
 }