test: import from e2e, nuxt 4 compat

Yizack · Jul 21, 2024 · 3a252d4 · 3a252d4
1 parent d332e04
commit 3a252d4
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 14 deletions.
diff --git a/test/fixtures/basic/app/app.vue b/test/fixtures/basic/app/app.vue
@@ -0,0 +1,5 @@
+<template>
+  <div>
+    <NuxtPage />
+  </div>
+</template>
diff --git a/test/fixtures/basic/app.vue → test/fixtures/basic/app/pages/index.vue b/test/fixtures/basic/app.vue → test/fixtures/basic/app/pages/index.vue
@@ -1,6 +1,3 @@
 <template>
   <div>Nuxt Webhook Validators</div>
 </template>
-
-<script setup>
-</script>
diff --git a/test/fixtures/basic/nuxt.config.ts b/test/fixtures/basic/nuxt.config.ts
@@ -1,9 +1,9 @@
 import { defineNuxtConfig } from 'nuxt/config'
+import myModule from '../../../src/module'
 
 export default defineNuxtConfig({
-  modules: [
-    '../../../src/module',
-  ],
+  future: { compatibilityVersion: 4 },
+  modules: [myModule],
   serverDir: '../../../playground/server',
   runtimeConfig: {
     webhook: {

diff --git a/test/module.test.ts b/test/module.test.ts
@@ -1,6 +1,6 @@
 import { fileURLToPath } from 'node:url'
 import { describe, it, expect } from 'vitest'
-import { $fetch, setup } from '@nuxt/test-utils'
+import { $fetch, setup } from '@nuxt/test-utils/e2e'
 import * as events from './events'
 
 const validWebhook = { isValidWebhook: true }

diff --git a/test/simulations/discord.ts b/test/simulations/discord.ts
@@ -1,5 +1,5 @@
 import { subtle } from 'node:crypto'
-import { $fetch } from '@nuxt/test-utils'
+import { $fetch } from '@nuxt/test-utils/e2e'
 import { encoder, ed25519Algorithm } from '../../src/runtime/server/lib/helpers'
 
 const body = { type: 0, data: 'testBody' }

diff --git a/test/simulations/github.ts b/test/simulations/github.ts
@@ -1,6 +1,6 @@
 import { subtle } from 'node:crypto'
 import { Buffer } from 'node:buffer'
-import { $fetch } from '@nuxt/test-utils'
+import { $fetch } from '@nuxt/test-utils/e2e'
 import { encoder, hmacAlgorithm } from '../../src/runtime/server/lib/helpers'
 import nuxtConfig from '../fixtures/basic/nuxt.config'
 

diff --git a/test/simulations/heroku.ts b/test/simulations/heroku.ts
@@ -1,6 +1,6 @@
 import { subtle } from 'node:crypto'
 import { Buffer } from 'node:buffer'
-import { $fetch } from '@nuxt/test-utils'
+import { $fetch } from '@nuxt/test-utils/e2e'
 import { encoder, hmacAlgorithm } from '../../src/runtime/server/lib/helpers'
 import nuxtConfig from '../fixtures/basic/nuxt.config'
 

diff --git a/test/simulations/nuxthub.ts b/test/simulations/nuxthub.ts
@@ -1,5 +1,5 @@
 import { sha256 } from 'ohash'
-import { $fetch } from '@nuxt/test-utils'
+import { $fetch } from '@nuxt/test-utils/e2e'
 import nuxtConfig from '../fixtures/basic/nuxt.config'
 
 const body = 'testBody'

diff --git a/test/simulations/paddle.ts b/test/simulations/paddle.ts
@@ -1,5 +1,5 @@
 import { subtle } from 'node:crypto'
-import { $fetch } from '@nuxt/test-utils'
+import { $fetch } from '@nuxt/test-utils/e2e'
 import { encoder, hmacAlgorithm } from '../../src/runtime/server/lib/helpers'
 import nuxtConfig from '../fixtures/basic/nuxt.config'
 

diff --git a/test/simulations/stripe.ts b/test/simulations/stripe.ts
@@ -1,6 +1,6 @@
 import { subtle } from 'node:crypto'
 import { Buffer } from 'node:buffer'
-import { $fetch } from '@nuxt/test-utils'
+import { $fetch } from '@nuxt/test-utils/e2e'
 import { encoder, hmacAlgorithm } from '../../src/runtime/server/lib/helpers'
 import nuxtConfig from '../fixtures/basic/nuxt.config'
 

diff --git a/test/simulations/twitch.ts b/test/simulations/twitch.ts
@@ -1,6 +1,6 @@
 import { subtle } from 'node:crypto'
 import { Buffer } from 'node:buffer'
-import { $fetch } from '@nuxt/test-utils'
+import { $fetch } from '@nuxt/test-utils/e2e'
 import { encoder, hmacAlgorithm } from '../../src/runtime/server/lib/helpers'
 import nuxtConfig from '../fixtures/basic/nuxt.config'