Tidying tests

Author: jawj

tests/browser/browser.test.ts

@@ -2,29 +2,26 @@ import { expect, test, assertType } from 'vitest';
 import { server } from '@vitest/browser/context';
 import { neon, Pool, Client, type QueryResult } from '../../dist/npm';
 
-const { env } = server.config;
-globalThis.process = { env } as any;
-
-const DB_URL = process.env.VITE_NEON_DB_URL!;
+const DATABASE_URL = server.config.env.VITE_NEON_DB_URL!;
 
 test('http query', async () => {
-  const sql = neon(DB_URL);
+  const sql = neon(DATABASE_URL);
   const str = 'fetch';
   const fetchResult = await sql`SELECT ${str} AS str`;
   assertType<Record<string, unknown>[]>(fetchResult);
   expect(fetchResult).toStrictEqual([{ str: 'fetch' }]);
 });
 
 test('pool.query() over WebSockets', async () => {
-  const wsPool = new Pool({ connectionString: DB_URL });
+  const wsPool = new Pool({ connectionString: DATABASE_URL });
   const wsResult = await wsPool.query('SELECT $1::int AS one', [1]);
   assertType<QueryResult<any>>(wsResult);
   expect(wsResult.rows).toStrictEqual([{ one: 1 }]);
   expect((wsResult as any).viaNeonFetch).toBeUndefined();
 });
 
 test('client.query()', async () => {
-  const client = new Client(DB_URL);
+  const client = new Client(DATABASE_URL);
   await client.connect();
   const wsResult = await client.query('SELECT $1::int AS one', [1]);
   assertType<QueryResult<any>>(wsResult);

tests/cli/http.test.ts

@@ -4,7 +4,6 @@ import {
   neon,
   neonConfig,
   Pool,
-  type QueryResult,
 } from '../../dist/npm';
 import { sampleQueries } from './sampleQueries';
 import { shimWebSocketIfRequired } from './ws';

tests/cli/sampleQueries.ts

@@ -50,6 +50,7 @@ export const sampleQueries = (sql: NeonQueryFunction<any, any>) => [
   sql`SELECT ${new Uint8Array([65, 66, 67])} AS bytea`,
   sql`SELECT ${new Uint8Array(65536).fill(128)} AS bytea`,
   sql`SELECT ${Buffer.from([65, 66, 67])} AS bytea`,
+  sql`SELECT ${1} AS one, ${sql("'raw'")} AS raw, ${'x'} AS x, ${now} AS date`,  // multiple types plus raw SQL
 
   // non-tagged-template
   sql('SELECT $1::timestamp AS timestampnow', [now]),

tests/cli/ws.test.ts

@@ -155,7 +155,7 @@ describe.each([
     process.versions !== undefined &&
     parseInt(process.versions.node) >= 19
   ) {
-    // subtls test requires SCRAM auth, which requires `crytpo.subtle`, which is only available from Node 19 onwards
+    // subtls test requires SCRAM auth, which requires `crytpo.subtle`, available from Node 19 onwards
     test('client.query() with custom WebSocket proxy and subtls', async () => {
       const client = new WsClient(DB_URL);
       client.neonConfig.wsProxy = process.env.VITE_WSPROXY!;

tests/cli/ws.ts

@@ -2,9 +2,7 @@ import { neonConfig } from '../../dist/npm';
 
 export async function shimWebSocketIfRequired() {
   if (typeof WebSocket !== 'function') {
-    console.info(
-      'Native WebSocket not found: importing ws for neonConfig.webSocketConstructor',
-    );
+    console.info('Importing ws for neonConfig.webSocketConstructor');
     const { WebSocket } = await import('ws');
     neonConfig.webSocketConstructor = WebSocket;
   } else {