chore: update tests

withastro · Aug 12, 2024 · d835645 · d835645
1 parent 18978c7
commit d835645
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 41 deletions.
diff --git a/packages/astro/test/env-secret.test.js b/packages/astro/test/env-secret.test.js
@@ -71,10 +71,8 @@ describe('astro:env secret variables', () => {
 	it('fails if validateSecrets is enabled and secret is not set', async () => {
 		fixture = await loadFixture({
 			root: './fixtures/astro-env-server-secret/',
-			experimental: {
-				env: {
-					validateSecrets: true,
-				},
+			env: {
+				validateSecrets: true,
 			},
 		});
 

diff --git a/packages/astro/test/fixtures/astro-env-required-public/astro.config.mjs b/packages/astro/test/fixtures/astro-env-required-public/astro.config.mjs
@@ -2,12 +2,10 @@ import { defineConfig, envField } from 'astro/config';
 
 // https://astro.build/config
 export default defineConfig({
-	experimental: {
-		env: {
-			schema: {
-				FOO: envField.string({ context: "client", access: "public" }),
-				BAR: envField.number({ context: "server", access: "public" }),
-			}
+	env: {
+		schema: {
+			FOO: envField.string({ context: "client", access: "public" }),
+			BAR: envField.number({ context: "server", access: "public" }),
 		}
 	}
 });
diff --git a/packages/astro/test/fixtures/astro-env-server-fail/astro.config.mjs b/packages/astro/test/fixtures/astro-env-server-fail/astro.config.mjs
@@ -2,11 +2,9 @@ import { defineConfig, envField } from 'astro/config';
 
 // https://astro.build/config
 export default defineConfig({
-	experimental: {
-		env: {
-			schema: {
-				FOO: envField.string({ context: "server", access: "public", optional: true, default: "ABC" }),
-			}
+	env: {
+		schema: {
+			FOO: envField.string({ context: "server", access: "public", optional: true, default: "ABC" }),
 		}
 	}
 });
diff --git a/packages/astro/test/fixtures/astro-env-server-secret/astro.config.mjs b/packages/astro/test/fixtures/astro-env-server-secret/astro.config.mjs
@@ -2,11 +2,9 @@ import { defineConfig, envField } from 'astro/config';
 
 // https://astro.build/config
 export default defineConfig({
-	experimental: {
-		env: {
-			schema: {
-				KNOWN_SECRET: envField.number({ context: "server", access: "secret" })
-			}
+	env: {
+		schema: {
+			KNOWN_SECRET: envField.number({ context: "server", access: "secret" })
 		}
 	}
 });
diff --git a/packages/astro/test/fixtures/astro-env/astro.config.mjs b/packages/astro/test/fixtures/astro-env/astro.config.mjs
@@ -2,13 +2,11 @@ import { defineConfig, envField } from 'astro/config';
 
 // https://astro.build/config
 export default defineConfig({
-	experimental: {
-		env: {
-			schema: {
-				FOO: envField.string({ context: "client", access: "public", optional: true, default: "ABC" }),
-				BAR: envField.string({ context: "client", access: "public", optional: true, default: "DEF" }),
-				BAZ: envField.string({ context: "server", access: "public", optional: true, default: "GHI" }),
-			}
+	env: {
+		schema: {
+			FOO: envField.string({ context: "client", access: "public", optional: true, default: "ABC" }),
+			BAR: envField.string({ context: "client", access: "public", optional: true, default: "DEF" }),
+			BAZ: envField.string({ context: "server", access: "public", optional: true, default: "GHI" }),
 		}
 	}
 });
diff --git a/packages/astro/test/units/config/config-validate.test.js b/packages/astro/test/units/config/config-validate.test.js
@@ -358,10 +358,8 @@ describe('Config Validation', () => {
 			assert.doesNotThrow(() =>
 				validateConfig(
 					{
-						experimental: {
-							env: {
-								schema: undefined,
-							},
+						env: {
+							schema: undefined,
 						},
 					},
 					process.cwd(),
@@ -373,11 +371,9 @@ describe('Config Validation', () => {
 			assert.doesNotThrow(() =>
 				validateConfig(
 					{
-						experimental: {
-							env: {
-								schema: {
-									ABC123: envField.string({ access: 'public', context: 'server' }),
-								},
+						env: {
+							schema: {
+								ABC123: envField.string({ access: 'public', context: 'server' }),
 							},
 						},
 					},
@@ -389,11 +385,9 @@ describe('Config Validation', () => {
 		it('Should not allow schema variables starting with a number', async () => {
 			const configError = await validateConfig(
 				{
-					experimental: {
-						env: {
-							schema: {
-								'123ABC': envField.string({ access: 'public', context: 'server' }),
-							},
+					env: {
+						schema: {
+							'123ABC': envField.string({ access: 'public', context: 'server' }),
 						},
 					},
 				},