Skip to content

Commit 76cd05d

Browse files
authored
Merge pull request #520 from mjbvz/tests-dirname
Use __dirname in tests so that cwd doesn't matter
2 parents d012749 + 5fe97d6 commit 76cd05d

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

tests/build.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ const tsGrammarFileName = "TypeScript.tmLanguage"
55
const tsReactGrammarFileName = "TypeScriptReact.tmLanguage"
66

77
const register = new vt.Registry();
8-
const tsGrammar = register.loadGrammarFromPathSync("../" + tsGrammarFileName);
9-
const tsReactGrammar = register.loadGrammarFromPathSync("../" + tsReactGrammarFileName);
8+
const tsGrammar = register.loadGrammarFromPathSync(path.join(__dirname, '..', tsGrammarFileName));
9+
const tsReactGrammar = register.loadGrammarFromPathSync(path.join(__dirname, '..', tsReactGrammarFileName));
1010

1111
const marker = '^^';
1212

tests/test.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ import path = require('path');
33
import chai = require('chai');
44
import build = require('./build');
55

6-
const generatedFolder = "generated";
7-
const baselineFolder = "baselines";
6+
const generatedFolder = path.join(__dirname, 'generated');
7+
const baselineFolder = path.join(__dirname, 'baselines');
8+
const casesFolder = path.join(__dirname, 'cases');
89

910
function ensureCleanGeneratedFolder() {
1011
if (fs.existsSync(generatedFolder)) {
@@ -20,8 +21,8 @@ function ensureCleanGeneratedFolder() {
2021
ensureCleanGeneratedFolder();
2122

2223
// Generate the new baselines
23-
for (const fileName of fs.readdirSync('cases')) {
24-
const text = fs.readFileSync(path.join('./cases', fileName), 'utf8');
24+
for (const fileName of fs.readdirSync(casesFolder)) {
25+
const text = fs.readFileSync(path.join(casesFolder, fileName), 'utf8');
2526
const parsedFileName = path.parse(fileName);
2627

2728
let wholeBaseline: string;

0 commit comments

Comments
 (0)