refactor(match): use pathMatch instead of fullPath for unnamed params

vuejs · Apr 11, 2018 · 5edc2ec · 5edc2ec
1 parent b505400
commit 5edc2ec
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/create-matcher.js b/src/create-matcher.js
@@ -190,7 +190,7 @@ function matchRoute (
     const val = typeof m[i] === 'string' ? decodeURIComponent(m[i]) : m[i]
     if (key) {
       // Fix #1994: using * with props: true generates a param named 0
-      params[key.name || 'fullPath'] = val
+      params[key.name || 'pathMatch'] = val
     }
   }
 

diff --git a/test/e2e/specs/route-matching.js b/test/e2e/specs/route-matching.js
@@ -83,7 +83,7 @@ module.exports = {
           route.matched[0].path === '/asterisk/*' &&
           route.fullPath === '/asterisk/foo' &&
           JSON.stringify(route.params) === JSON.stringify({
-            'fullPath': 'foo'
+            pathMatch: 'foo'
           })
         )
       }, null, '/asterisk/foo')
@@ -96,7 +96,7 @@ module.exports = {
           route.matched[0].path === '/asterisk/*' &&
           route.fullPath === '/asterisk/foo/bar' &&
           JSON.stringify(route.params) === JSON.stringify({
-            'fullPath': 'foo/bar'
+            pathMatch: 'foo/bar'
           })
         )
       }, null, '/asterisk/foo/bar')
@@ -120,7 +120,7 @@ module.exports = {
           route.matched[0].path === '/optional-group/(foo/)?bar' &&
           route.fullPath === '/optional-group/foo/bar' &&
           JSON.stringify(route.params) === JSON.stringify({
-            0: 'foo/'
+            pathMatch: 'foo/'
           })
         )
       }, null, '/optional-group/foo/bar')

diff --git a/test/unit/specs/create-matcher.spec.js b/test/unit/specs/create-matcher.spec.js
@@ -34,8 +34,8 @@ describe('Creating Matcher', function () {
     expect(console.warn).not.toHaveBeenCalled()
   })
 
-  it('matches asterisk routes with fullName as the param', function () {
+  it('matches asterisk routes with a default param name', function () {
     const { params } = match({ path: '/not-found' }, routes[0])
-    expect(params).toEqual({ fullPath: '/not-found' })
+    expect(params).toEqual({ pathMatch: '/not-found' })
   })
 })