Merge pull request #128 from mwaldstein/master

Bug fixes to page (route tracking with pageviewTempland and strings) and tests (clear test pollution)

Author: MatteoGabriele

__tests__/lib/event.spec.js

@@ -6,6 +6,8 @@ window.ga = jest.fn()
 let $vm
 
 beforeEach(() => {
+  window.ga.mockClear()
+
   Vue.use(VueAnalytics, {
     id: 'UA-1234-5'
   })

__tests__/lib/exception.spec.js

@@ -6,6 +6,8 @@ window.ga = jest.fn()
 let $vm
 
 beforeEach(() => {
+  window.ga.mockClear()
+
   Vue.config.errorHandler = jest.fn()
 
   Vue.use(VueAnalytics, {

__tests__/lib/page.spec.js

@@ -30,6 +30,8 @@ window.ga = jest.fn()
 let $vm
 
 beforeEach(done => {
+  window.ga.mockClear()
+
   Vue.use(VueRouter)
 
   const router = new VueRouter({

__tests__/lib/require.spec.js

@@ -6,6 +6,8 @@ window.ga = jest.fn()
 let $vm
 
 beforeEach(() => {
+  window.ga.mockClear()
+
   Vue.use(VueAnalytics, {
     id: 'UA-1234-5'
   })

__tests__/lib/set.spec.js

@@ -6,6 +6,8 @@ window.ga = jest.fn()
 let $vm
 
 beforeEach(() => {
+  window.ga.mockClear()
+
   Vue.use(VueAnalytics, {
     id: 'UA-1234-5'
   })

__tests__/lib/social.spec.js

@@ -6,6 +6,8 @@ window.ga = jest.fn()
 let $vm
 
 beforeEach(() => {
+  window.ga.mockClear()
+
   Vue.use(VueAnalytics, {
     id: 'UA-1234-5'
   })

__tests__/lib/time.spec.js

@@ -6,6 +6,8 @@ window.ga = jest.fn()
 let $vm
 
 beforeEach(() => {
+  window.ga.mockClear()
+
   Vue.use(VueAnalytics, {
     id: 'UA-1234-5'
   })

src/lib/page.js

@@ -25,25 +25,11 @@ export default function page (...args) {
   }
 
   if (route) {
-    const {
-      router,
-      autoTracking: {
-        transformQueryString,
-        prependBase
-      }
-    } = config
-
-    const queryString = getQueryString(route.query)
-    const base = router && router.options.base
-    const needsBase = prependBase && base
-
-    let path = route.path + (transformQueryString ? queryString : '')
-    path = needsBase ? getBasePath(base, path) : path
-
-    set('page', path)
-    query('send', 'pageview')
+    trackRoute(route)
   } else {
-    set('page', args[0].page)
+    // We can call with `page('/my/path')`
+    let page = typeof args[0] === 'object' ? args[0].page : args[0]
+    set('page', page)
     query('send', 'pageview', ...args)
   }
 }
@@ -68,7 +54,26 @@ export function trackRoute (route) {
     return
   }
 
-  page(proxy ? proxy(route) : route)
+  if (proxy) {
+    page(proxy(route))
+  } else {
+    const {
+      router,
+      autoTracking: {
+        transformQueryString,
+        prependBase
+      }
+    } = config
+
+    const queryString = getQueryString(route.query)
+    const base = router && router.options.base
+    const needsBase = prependBase && base
+
+    let path = route.path + (transformQueryString ? queryString : '')
+    path = needsBase ? getBasePath(base, path) : path
+    
+    page(path)
+  }
 }
 
 export function autoTracking () {