test: move unit tests next to files (NASA-AMMOS#45)

- Also reorg e2e test folder

Author: camargo

tests/e2e/data/banananation-develop.jar e2e-tests/data/banananation-develop.jar

@@ -21,7 +21,7 @@ export class Dictionaries {
     this.page = page;
 
     this.dictionaryName = uniqueNamesGenerator({ dictionaries: [colors, animals] });
-    this.dictionaryPath = 'tests/e2e/data/command-dictionary.xml';
+    this.dictionaryPath = 'e2e-tests/data/command-dictionary.xml';
 
     const dictionaryFile = readFileSync(this.dictionaryPath);
     const dictionaryXml = dictionaryFile.toString().replace(/GENERIC/, this.dictionaryName);

tests/e2e/data/command-dictionary.xml e2e-tests/data/command-dictionary.xml

@@ -23,7 +23,7 @@ export class Models {
     this.page = page;
 
     // TODO: Pull .jar file directly from built aerie project.
-    this.jarPath = 'tests/e2e/data/banananation-develop.jar';
+    this.jarPath = 'e2e-tests/data/banananation-develop.jar';
     this.modelName = uniqueNamesGenerator({ dictionaries: [colors, animals] });
     this.modelVersion = '1.0.0';
 

tests/e2e/fixtures/AppNav.ts e2e-tests/fixtures/AppNav.ts

@@ -9,7 +9,7 @@ const config: PlaywrightTestConfig = {
     ['junit', { outputFile: 'e2e-test-results/junit-results.xml' }],
   ],
   retries: 0,
-  testDir: './tests/e2e',
+  testDir: './e2e-tests',
   use: {
     baseURL: 'http://localhost:3000',
     browserName: 'chromium',

tests/e2e/fixtures/Dictionaries.ts e2e-tests/fixtures/Dictionaries.ts

@@ -1,5 +1,5 @@
 import { expect, test } from 'vitest';
-import { getDoy } from '../../src/utilities/time';
+import { getDoy } from './time';
 
 test('getDoy', () => {
   const doy = getDoy(new Date('1/3/2019'));

tests/e2e/fixtures/ExpansionRules.ts e2e-tests/fixtures/ExpansionRules.ts

@@ -8,9 +8,9 @@ const config = {
     vite: {
       test: {
         environment: 'jsdom',
-        include: ['./tests/unit/**/*.test.ts'],
-        outputFile: 'unit-test-results/json-results.json',
-        reporters: 'json',
+        include: ['./src/**/*.test.ts'],
+        outputFile: process.env.CI ? 'unit-test-results/json-results.json' : null,
+        reporters: process.env.CI ? 'json' : null,
       },
     },
   },

tests/e2e/fixtures/ExpansionSets.ts e2e-tests/fixtures/ExpansionSets.ts

@@ -16,5 +16,5 @@
     "target": "es2020"
   },
   "extends": "./.svelte-kit/tsconfig.json",
-  "include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.ts", "src/**/*.svelte", "tests/unit/**/*.test.ts"]
+  "include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.ts", "src/**/*.svelte"]
 }