fix: refactor and improve localized route resolution (#3283)

nuxt-modules · Dec 26, 2024 · df49499 · df49499
1 parent 9987394
commit df49499
Show file tree

Hide file tree

Showing 2 changed files with 105 additions and 196 deletions.
diff --git a/specs/routing/routing-tests.ts b/specs/routing/routing-tests.ts
@@ -1,3 +1,5 @@
+/// <reference types="vitest/globals" />
+
 import { STRATEGIES } from '../../src/constants'
 import type { Strategies } from '../../src/types'
 import { getText, gotoPath, renderPage, waitForURL } from '../helper'
@@ -43,17 +45,10 @@ export async function localePathTests(strategy: Strategies) {
   expect(await getText(page, '#locale-path .query-foo-string')).toEqual(prefixPath('?foo=1'))
   expect(await getText(page, '#locale-path .query-foo-string-about')).toEqual(prefixPath('/about?foo=1'))
   expect(await getText(page, '#locale-path .query-foo-test-string')).toEqual(prefixPath('/about?foo=1&test=2'))
-  if (strategy === 'no_prefix') {
-    // TODO: fix localePath escapes paths for `no_prefix` strategy
-    // unexpectedly resolves to /path/as%20a%20test?foo=bar+sentence
-    expect(await getText(page, '#locale-path .query-foo-path-param')).not.toEqual(
-      prefixPath('/path/as a test?foo=bar+sentence')
-    )
-  } else {
-    expect(await getText(page, '#locale-path .query-foo-path-param')).toEqual(
-      prefixPath('/path/as a test?foo=bar+sentence')
-    )
-  }
+
+  expect(await getText(page, '#locale-path .query-foo-path-param')).toEqual(
+    prefixPath('/path/as a test?foo=bar+sentence')
+  )
   expect(await getText(page, '#locale-path .query-foo-path-param-escaped')).toEqual(
     prefixPath('/path/as%20a%20test?foo=bar+sentence')
   )