Fix tests that had incorrect query param assumptions

Author: alexspeller

packages/react/test-app/Pages/DeepMergeProps.tsx

@@ -24,7 +24,7 @@ export default ({ bar, foo, baz }: PageProps) => {
 
   const getFresh = () => {
     setPage(0)
-    router.reload({
+    router.visit('/deep-merge-props', {
       reset: ['foo', 'baz'],
     })
   }

packages/react/test-app/Pages/MatchPropsOnKey.tsx

@@ -26,7 +26,7 @@ export default ({ bar, foo, baz }: PageProps) => {
   const [page, setPage] = useState(foo.page)
 
   const reloadIt = () => {
-    router.reload({
+    router.visit('/match-props-on-key', {
       data: {
         page,
       },
@@ -39,7 +39,7 @@ export default ({ bar, foo, baz }: PageProps) => {
 
   const getFresh = () => {
     setPage(0)
-    router.reload({
+    router.visit('/match-props-on-key', {
       reset: ['foo', 'baz'],
     })
   }

packages/svelte/test-app/Pages/DeepMergeProps.svelte

@@ -21,7 +21,7 @@
 
   const getFresh = () => {
     page = 0
-    router.reload({
+    router.visit('/deep-merge-props', {
       reset: ['foo', 'baz'],
     })
   }

packages/svelte/test-app/Pages/MatchPropsOnKey.svelte

@@ -21,7 +21,7 @@
   let page = foo.page
 
   const reloadIt = () => {
-    router.reload({
+    router.visit('/match-props-on-key', {
       data: {
         page,
       },
@@ -35,7 +35,7 @@
 
   const getFresh = () => {
     page = 0
-    router.reload({
+    router.visit('/match-props-on-key', {
       reset: ['foo', 'baz'],
     })
   }

packages/vue3/test-app/Pages/DeepMergeProps.vue

@@ -34,7 +34,7 @@ const reloadIt = () => {
 
 const getFresh = () => {
   page.value = 0
-  router.reload({
+  router.visit('/deep-merge-props', {
     reset: ['foo', 'baz'],
   })
 }

packages/vue3/test-app/Pages/MatchPropsOnKey.vue

@@ -21,7 +21,7 @@ const props = defineProps<ComponentProps>()
 const page = ref(props.foo.page)
 
 const reloadIt = () => {
-  router.reload({
+  router.visit('/match-props-on-key', {
     data: {
       page: page.value,
     },
@@ -36,7 +36,7 @@ const reloadIt = () => {
 
 const getFresh = () => {
   page.value = 0
-  router.reload({
+  router.visit('/match-props-on-key', {
     reset: ['foo', 'baz'],
   })
 }

tests/deep-merge-props.spec.ts

@@ -29,7 +29,7 @@ test('can deep merge props', async ({ page }) => {
   await expect(page.getByText('foo.per_page is 5')).toBeVisible()
   await expect(page.getByText('foo.meta.label is third')).toBeVisible()
 
-  await clickAndWaitForResponse(page, 'Get Fresh', null, 'button')
+  await clickAndWaitForResponse(page, 'Get Fresh', '/deep-merge-props', 'button')
 
   await expect(page.getByText('bar count is 5')).toBeVisible()
   await expect(page.getByText('baz count is 5')).toBeVisible()

tests/form-component.spec.ts

@@ -441,7 +441,7 @@ test.describe('Form Component', () => {
       expect(scrollBefore).toBeGreaterThan(0)
 
       await page.getByRole('button', { name: 'Submit' }).click()
-      await page.waitForURL('/article')
+      await page.waitForURL(/\/article/)
 
       const scrollAfter = await page.evaluate(() => window.scrollY)
       // TODO: why is this not exactly 100?

tests/links.spec.ts

@@ -331,7 +331,7 @@ test.describe('preserve state', () => {
       await expect(componentKey).not.toBeUndefined()
 
       await page.getByRole('link', { name: label }).click()
-      await expect(page).toHaveURL('/links/preserve-state-page-two')
+      await expect(page).toHaveURL(`/links/preserve-state-page-two?foo=${expected}`)
 
       const newComponentKey = await page.evaluate(() => (window as any)._inertia_page_key)
       await expect(newComponentKey).not.toBeUndefined()
@@ -365,7 +365,7 @@ test.describe('preserve state', () => {
       await expect(componentKey).not.toBeUndefined()
 
       await page.getByRole('link', { name: label }).click()
-      await expect(page).toHaveURL('/links/preserve-state-page-two')
+      await expect(page).toHaveURL(`/links/preserve-state-page-two?foo=${expected}`)
 
       // @ts-ignore
       const newComponentKey = await page.evaluate(() => window._inertia_page_key)
@@ -398,7 +398,7 @@ test.describe('preserve url', () => {
     const initialUrl = page.url()
 
     await page.getByRole('link', { name: '[URL] Preserve: false' }).click()
-    await expect(page).toHaveURL('/links/preserve-url-page-two')
+    await expect(page).toHaveURL('/links/preserve-url-page-two?foo=baz')
     await expect(page.getByText('Foo is now baz')).toBeVisible()
     await expect(page.url()).not.toBe(initialUrl) // URL should have changed
   })
@@ -447,7 +447,7 @@ test.describe('preserve scroll', () => {
 
   test('does not reset untracked scroll regions in persistent layouts', async ({ page }) => {
     await page.getByRole('link', { exact: true, name: 'Reset Scroll' }).click()
-    await expect(page).toHaveURL('/links/preserve-scroll-false-page-two')
+    await expect(page).toHaveURL('/links/preserve-scroll-false-page-two?foo=bar')
     await expect(page.getByText('Foo is now bar')).toBeVisible()
     await page.getByRole('button', { exact: true, name: 'Update scroll positions' }).click()
     await expect(page.getByText('Document scroll position is 0 & 0')).toBeVisible()
@@ -460,7 +460,7 @@ test.describe('preserve scroll', () => {
     consoleMessages.listen(page)
 
     await page.getByRole('link', { exact: true, name: 'Reset Scroll (Callback)' }).click({ position: { x: 0, y: 0 } })
-    await expect(page).toHaveURL('/links/preserve-scroll-false-page-two')
+    await expect(page).toHaveURL('/links/preserve-scroll-false-page-two?foo=foo')
     await expect(page.getByText('Foo is now foo')).toBeVisible()
     await page.getByRole('button', { exact: true, name: 'Update scroll positions' }).click()
     await expect(page.getByText('Document scroll position is 0 & 0')).toBeVisible()
@@ -479,7 +479,7 @@ test.describe('preserve scroll', () => {
   test('does not restore untracked scroll regions when pressing the back button', async ({ page }) => {
     await page.getByRole('link', { exact: true, name: 'Reset Scroll' }).click()
 
-    await expect(page).toHaveURL('/links/preserve-scroll-false-page-two')
+    await expect(page).toHaveURL('/links/preserve-scroll-false-page-two?foo=bar')
     await expect(page.getByText('Foo is now bar')).toBeVisible()
 
     await scrollElementTo(
@@ -505,7 +505,7 @@ test.describe('preserve scroll', () => {
       .getByRole('link', { exact: true, name: 'Preserve Scroll (Callback)' })
       .click({ position: { x: 0, y: 0 } })
 
-    await expect(page).toHaveURL('/links/preserve-scroll-false-page-two')
+    await expect(page).toHaveURL('/links/preserve-scroll-false-page-two?foo=baz')
     await expect(page.getByText('Foo is now baz')).toBeVisible()
 
     await scrollElementTo(
@@ -567,7 +567,7 @@ test.describe('enabled', () => {
 
   test('resets scroll regions to the top when doing a regular visit', async ({ page }) => {
     await page.getByText('Reset Scroll', { exact: true }).click()
-    await expect(page).toHaveURL('/links/preserve-scroll-page-two')
+    await expect(page).toHaveURL('/links/preserve-scroll-page-two?foo=bar')
     await expect(page.getByText('Foo is now bar')).toBeVisible()
     await page.getByRole('button', { exact: true, name: 'Update scroll positions' }).click()
     await expect(page.getByText('Document scroll position is 0 & 0')).toBeVisible()
@@ -578,7 +578,7 @@ test.describe('enabled', () => {
     consoleMessages.listen(page)
     await page.getByText('Reset Scroll (Callback)', { exact: true }).click({ position: { x: 0, y: 0 } })
 
-    await expect(page).toHaveURL('/links/preserve-scroll-page-two')
+    await expect(page).toHaveURL('/links/preserve-scroll-page-two?foo=foo')
     await expect(page.getByText('Foo is now foo')).toBeVisible()
     await page.getByRole('button', { exact: true, name: 'Update scroll positions' }).click()
     await expect(page.getByText('Document scroll position is 0 & 0')).toBeVisible()
@@ -596,7 +596,7 @@ test.describe('enabled', () => {
   test('preserves scroll regions when using the "preserve-scroll" feature', async ({ page }) => {
     await page.getByText('Preserve Scroll', { exact: true }).click()
 
-    await expect(page).toHaveURL('/links/preserve-scroll-page-two')
+    await expect(page).toHaveURL('/links/preserve-scroll-page-two?foo=baz')
     await expect(page.getByText('Foo is now baz')).toBeVisible()
     await page.getByRole('button', { exact: true, name: 'Update scroll positions' }).click()
     await expect(page.getByText('Document scroll position is 5 & 7')).toBeVisible()
@@ -607,7 +607,7 @@ test.describe('enabled', () => {
     consoleMessages.listen(page)
     await page.getByText('Preserve Scroll (Callback)', { exact: true }).click({ position: { x: 0, y: 0 } })
 
-    await expect(page).toHaveURL('/links/preserve-scroll-page-two')
+    await expect(page).toHaveURL('/links/preserve-scroll-page-two?foo=baz')
     await expect(page.getByText('Foo is now baz')).toBeVisible()
     await page.getByRole('button', { exact: true, name: 'Update scroll positions' }).click()
     await expect(page.getByText('Document scroll position is 5 & 7')).toBeVisible()
@@ -623,7 +623,7 @@ test.describe('enabled', () => {
 
   test('restores all tracked scroll regions when pressing the back button', async ({ page }) => {
     await page.getByTestId('preserve').click()
-    await expect(page).toHaveURL('/links/preserve-scroll-page-two')
+    await expect(page).toHaveURL('/links/preserve-scroll-page-two?foo=baz')
     await page.waitForTimeout(100)
 
     await scrollElementTo(
@@ -844,7 +844,7 @@ test.describe('partial reloads', () => {
     requests.listen(page)
 
     await page.getByRole('link', { name: 'Update All' }).click()
-    await expect(page).toHaveURL('/links/partial-reloads')
+    await expect(page).toHaveURL('/links/partial-reloads?foo=1')
 
     await expect(requests.requests).toHaveLength(1)
 
@@ -858,7 +858,7 @@ test.describe('partial reloads', () => {
     requests.listen(page)
 
     await page.getByRole('link', { name: 'Only foo + bar' }).click()
-    await expect(page).toHaveURL('/links/partial-reloads')
+    await expect(page).toHaveURL('/links/partial-reloads?foo=1')
 
     await expect(requests.requests).toHaveLength(1)
 
@@ -873,7 +873,7 @@ test.describe('partial reloads', () => {
 
   test('it updates all props when the feature is not being used', async ({ page }) => {
     await page.getByRole('link', { name: 'Update All' }).click()
-    await expect(page).toHaveURL('/links/partial-reloads')
+    await expect(page).toHaveURL('/links/partial-reloads?foo=1')
 
     await expect(page.getByText('Foo is now 2')).toBeVisible()
     await expect(page.getByText('Bar is now 3')).toBeVisible()
@@ -882,21 +882,21 @@ test.describe('partial reloads', () => {
 
   test('it only updates props that are passed through "only"', async ({ page }) => {
     await page.getByRole('link', { name: 'Only foo + bar' }).click()
-    await expect(page).toHaveURL('/links/partial-reloads')
+    await expect(page).toHaveURL('/links/partial-reloads?foo=1')
 
     await expect(page.getByText('Foo is now 2')).toBeVisible()
     await expect(page.getByText('Bar is now 3')).toBeVisible()
     await expect(page.getByText('Baz is now 3')).toBeVisible()
 
     await page.getByRole('link', { name: 'Only baz' }).click()
-    await expect(page).toHaveURL('/links/partial-reloads')
+    await expect(page).toHaveURL('/links/partial-reloads?foo=2')
 
     await expect(page.getByText('Foo is now 2')).toBeVisible()
     await expect(page.getByText('Bar is now 3')).toBeVisible()
     await expect(page.getByText('Baz is now 5')).toBeVisible()
 
     await page.getByRole('link', { name: 'Update All' }).click()
-    await expect(page).toHaveURL('/links/partial-reloads')
+    await expect(page).toHaveURL('/links/partial-reloads?foo=2')
 
     await expect(page.getByText('Foo is now 3')).toBeVisible()
     await expect(page.getByText('Bar is now 4')).toBeVisible()
@@ -905,14 +905,14 @@ test.describe('partial reloads', () => {
 
   test('it only updates props that are not passed through "except"', async ({ page }) => {
     await page.getByRole('link', { name: 'Except foo + bar' }).click()
-    await expect(page).toHaveURL('/links/partial-reloads')
+    await expect(page).toHaveURL('/links/partial-reloads?foo=1')
 
     await expect(page.getByText('Foo is now 1')).toBeVisible()
     await expect(page.getByText('Bar is now 2')).toBeVisible()
     await expect(page.getByText('Baz is now 4')).toBeVisible()
 
     await page.getByRole('link', { name: 'Except baz' }).click()
-    await expect(page).toHaveURL('/links/partial-reloads')
+    await expect(page).toHaveURL('/links/partial-reloads?foo=1')
 
     await expect(page.getByText('Foo is now 2')).toBeVisible()
     await expect(page.getByText('Bar is now 3')).toBeVisible()