[Tests] reorganize tests

nvm-sh · Jun 7, 2024 · 9e280e5 · 9e280e5
1 parent 41a8ad6
commit 9e280e5
Show file tree

Hide file tree

Showing 19 changed files with 4 additions and 20 deletions.
diff --git a/test/fixtures/basic-invalid/.nvmrc → test/fixtures/invalid/basic-invalid/.nvmrc b/test/fixtures/basic-invalid/.nvmrc → test/fixtures/invalid/basic-invalid/.nvmrc
diff --git a/test/fixtures/basic-invalid/expected.json → ...tures/invalid/basic-invalid/expected.json b/test/fixtures/basic-invalid/expected.json → ...tures/invalid/basic-invalid/expected.json
diff --git a/test/fixtures/duplicate-pairs/.nvmrc → test/fixtures/invalid/duplicate-pairs/.nvmrc b/test/fixtures/duplicate-pairs/.nvmrc → test/fixtures/invalid/duplicate-pairs/.nvmrc
diff --git a/test/fixtures/duplicate-pairs/expected.json → ...res/invalid/duplicate-pairs/expected.json b/test/fixtures/duplicate-pairs/expected.json → ...res/invalid/duplicate-pairs/expected.json
diff --git a/test/fixtures/invalid/.nvmrc → test/fixtures/invalid/no-node/.nvmrc b/test/fixtures/invalid/.nvmrc → test/fixtures/invalid/no-node/.nvmrc
diff --git a/test/fixtures/invalid/expected.json → test/fixtures/invalid/no-node/expected.json b/test/fixtures/invalid/expected.json → test/fixtures/invalid/no-node/expected.json
diff --git a/test/fixtures/only-comments/.nvmrc → test/fixtures/invalid/only-comments/.nvmrc b/test/fixtures/only-comments/.nvmrc → test/fixtures/invalid/only-comments/.nvmrc
diff --git a/test/fixtures/only-comments/expected.json → ...tures/invalid/only-comments/expected.json b/test/fixtures/only-comments/expected.json → ...tures/invalid/only-comments/expected.json
diff --git a/test/fixtures/pre-normalized/.nvmrc → test/fixtures/invalid/pre-normalized/.nvmrc b/test/fixtures/pre-normalized/.nvmrc → test/fixtures/invalid/pre-normalized/.nvmrc
diff --git a/test/fixtures/pre-normalized/expected.json → ...ures/invalid/pre-normalized/expected.json b/test/fixtures/pre-normalized/expected.json → ...ures/invalid/pre-normalized/expected.json
diff --git a/test/fixtures/basic-comments/.nvmrc → test/fixtures/valid/basic-comments/.nvmrc b/test/fixtures/basic-comments/.nvmrc → test/fixtures/valid/basic-comments/.nvmrc
diff --git a/test/fixtures/basic-comments/expected.json → ...xtures/valid/basic-comments/expected.json b/test/fixtures/basic-comments/expected.json → ...xtures/valid/basic-comments/expected.json
diff --git a/test/fixtures/basic-with-comment/.nvmrc → .../fixtures/valid/basic-with-comment/.nvmrc b/test/fixtures/basic-with-comment/.nvmrc → .../fixtures/valid/basic-with-comment/.nvmrc
diff --git a/...fixtures/basic-with-comment/expected.json → ...es/valid/basic-with-comment/expected.json b/...fixtures/basic-with-comment/expected.json → ...es/valid/basic-with-comment/expected.json
diff --git a/test/fixtures/basic-with-npm/.nvmrc → test/fixtures/valid/basic-with-npm/.nvmrc b/test/fixtures/basic-with-npm/.nvmrc → test/fixtures/valid/basic-with-npm/.nvmrc
diff --git a/test/fixtures/basic-with-npm/expected.json → ...xtures/valid/basic-with-npm/expected.json b/test/fixtures/basic-with-npm/expected.json → ...xtures/valid/basic-with-npm/expected.json
diff --git a/test/fixtures/basic/.nvmrc → test/fixtures/valid/basic/.nvmrc b/test/fixtures/basic/.nvmrc → test/fixtures/valid/basic/.nvmrc
diff --git a/test/fixtures/basic/expected.json → test/fixtures/valid/basic/expected.json b/test/fixtures/basic/expected.json → test/fixtures/valid/basic/expected.json
diff --git a/test/index.mjs b/test/index.mjs
@@ -8,31 +8,15 @@ import stripColors from 'strip-color';
 
 const fixtureDir = join(import.meta.dirname, 'fixtures');
 
-const fixtures = readdirSync(fixtureDir);
+const valid = readdirSync(join(fixtureDir, 'valid'));
+const invalid = readdirSync(join(fixtureDir, 'invalid'));
 
 test('nvmrc', async (t) => {
-	const valid = [
-		'basic',
-		'basic-comments',
-		'basic-with-comment',
-		'basic-with-npm',
-	];
-
-	const invalid = [
-		'basic-invalid',
-		'invalid',
-		'only-comments',
-		'pre-normalized',
-		'duplicate-pairs',
-	];
-
-	t.deepEqual(fixtures.sort(), valid.concat(invalid).sort(), 'all fixtures are accounted for');
-
 	const bin = join(import.meta.dirname, '../nvmrc.mjs');
 
 	for (const fixture of valid) {
 		t.test(`fixture ${fixture}`, (st) => {
-			const cwd = join(fixtureDir, fixture);
+			const cwd = join(fixtureDir, 'valid', fixture);
 
 			const { status, stdout } = spawnSync(`${bin}`, { cwd });
 
@@ -52,7 +36,7 @@ test('nvmrc', async (t) => {
 
 	for (const fixture of invalid) {
 		t.test(`fixture ${fixture}`, (st) => {
-			const cwd = join(fixtureDir, fixture);
+			const cwd = join(fixtureDir, 'invalid', fixture);
 
 			const { status, stderr } = spawnSync(`${bin}`, { cwd });