test: refactor imports and old bsStatus

diff --git a/packages/router/old-e2e/modal/index.ts b/packages/router/old-e2e/modal/index.ts
index 2929c23e8e1c1bc11a5fef06f31aa53c3375177d..f6db80d55455fedcac14420de9fa2076a6e9a8cb 100644 (file)
--- a/packages/router/old-e2e/modal/index.ts
+++ b/packages/router/old-e2e/modal/index.ts
@@ -1,6 +1,10 @@
 import '../global.css'
-import { createRouter, createWebHistory, useRoute } from '../../src'
-import { RouteLocationNormalizedLoaded } from '../../src/types'
+import {
+  RouteLocationNormalizedLoaded,
+  createRouter,
+  createWebHistory,
+  useRoute,
+} from 'vue-router'
 import {
   createApp,
   readonly,

diff --git a/packages/router/old-e2e/multi-app/index.ts b/packages/router/old-e2e/multi-app/index.ts
index 151742d23f25e0f62971cca60e5e7ff2daf2e062..27a11a3df2227fd4f99dd4e3d2fa5ffec2bf009a 100644 (file)
--- a/packages/router/old-e2e/multi-app/index.ts
+++ b/packages/router/old-e2e/multi-app/index.ts
@@ -1,6 +1,5 @@
 import '../global.css'
-import { createRouter, createWebHistory } from '../../src'
-import { RouteComponent } from '../../src/types'
+import { RouteComponent, createRouter, createWebHistory } from 'vue-router'
 import { createApp, ref, watchEffect, App, inject } from 'vue'
 
 const Home: RouteComponent = {

diff --git a/packages/router/old-e2e/scroll-behavior/index.ts b/packages/router/old-e2e/scroll-behavior/index.ts
index fe561d9668059d890a0a937e59d50626e953445e..c153c4bac9515efe62267a9d1d000b01cb2bd241 100644 (file)
--- a/packages/router/old-e2e/scroll-behavior/index.ts
+++ b/packages/router/old-e2e/scroll-behavior/index.ts
@@ -1,6 +1,10 @@
 import '../global.css'
-import { createRouter, createWebHistory, RouterScrollBehavior } from '../../src'
-import { RouteComponent } from '../../src/types'
+import {
+  RouteComponent,
+  createRouter,
+  createWebHistory,
+  RouterScrollBehavior,
+} from 'vue-router'
 import { createApp, ref } from 'vue'
 import { scrollWaiter } from './scrollWaiter'
 

diff --git a/packages/router/old-e2e/specs/modal.js b/packages/router/old-e2e/specs/modal.js
index aee132c1c29768ef002491a40ab4d50a1eaf92bb..1a59f5fcaf004a39ceff75f8ff850322f54fa2b0 100644 (file)
--- a/packages/router/old-e2e/specs/modal.js
+++ b/packages/router/old-e2e/specs/modal.js
@@ -1,10 +1,6 @@
-const bsStatus = require('../browserstack-send-status')
-
 const baseURL = 'http://localhost:3000/modal'
 
 module.exports = {
-  ...bsStatus(),
-
   '@tags': ['history'],
 
   /** @type {import('nightwatch').NightwatchTest} */
@@ -12,15 +8,15 @@ module.exports = {
     browser
       .url(baseURL + '/')
       .waitForElementPresent('#app > *', 1000)
-      .assert.containsText('h1', 'Home')
+      .assert.textContains('h1', 'Home')
       .assert.not.visible('dialog')
-      .assert.containsText('.child', 'child')
+      .assert.textContains('.child', 'child')
 
       .click('li:nth-child(2) button')
       .assert.urlEquals(baseURL + '/users/1')
       .assert.visible('dialog')
-      .assert.containsText('dialog', 'User #1')
-      .assert.containsText('.child', 'child')
+      .assert.textContains('dialog', 'User #1')
+      .assert.textContains('.child', 'child')
 
       .end()
   },
@@ -30,7 +26,7 @@ module.exports = {
     browser
       .url(baseURL + '/')
       .waitForElementPresent('#app > *', 1000)
-      .assert.containsText('h1', 'Home')
+      .assert.textContains('h1', 'Home')
 
       .click('li:nth-child(2) button')
       .assert.visible('dialog')
@@ -55,17 +51,17 @@ module.exports = {
     browser
       .url(baseURL + '/')
       .waitForElementPresent('#app > *', 1000)
-      .assert.containsText('h1', 'Home')
+      .assert.textContains('h1', 'Home')
 
       .click('li:nth-child(2) button')
       .assert.visible('dialog')
       .refresh()
       .assert.urlEquals(baseURL + '/users/1')
-      .assert.containsText('h1', 'Home')
+      .assert.textContains('h1', 'Home')
       .assert.visible('dialog')
       .back()
       .assert.urlEquals(baseURL + '/')
-      .assert.containsText('h1', 'Home')
+      .assert.textContains('h1', 'Home')
       .assert.not.visible('dialog')
 
       .end()
@@ -76,21 +72,21 @@ module.exports = {
     browser
       .url(baseURL + '/')
       .waitForElementPresent('#app > *', 1000)
-      .assert.containsText('h1', 'Home')
+      .assert.textContains('h1', 'Home')
       .assert.not.visible('dialog')
 
       .click('li:nth-child(2) a')
       .assert.urlEquals(baseURL + '/users/1')
-      .assert.containsText('h1', 'User #1')
+      .assert.textContains('h1', 'User #1')
       .click('#app a')
       .assert.urlEquals(baseURL + '/')
-      .assert.containsText('h1', 'Home')
+      .assert.textContains('h1', 'Home')
       .click('li:nth-child(3) a')
       .assert.urlEquals(baseURL + '/users/2')
-      .assert.containsText('h1', 'User #2')
+      .assert.textContains('h1', 'User #2')
       .click('#app a')
       .assert.urlEquals(baseURL + '/')
-      .assert.containsText('h1', 'Home')
+      .assert.textContains('h1', 'Home')
       .click('li:nth-child(2) button')
       .assert.urlEquals(baseURL + '/users/1')
       .assert.visible('dialog')
@@ -99,28 +95,28 @@ module.exports = {
       .assert.urlEquals(baseURL + '/')
       .back()
       .assert.urlEquals(baseURL + '/users/2')
-      .assert.containsText('h1', 'User #2')
+      .assert.textContains('h1', 'User #2')
       .back()
       .assert.urlEquals(baseURL + '/')
-      .assert.containsText('h1', 'Home')
+      .assert.textContains('h1', 'Home')
       .back()
       .assert.urlEquals(baseURL + '/users/1')
-      .assert.containsText('h1', 'User #1')
+      .assert.textContains('h1', 'User #1')
       .back()
       .assert.urlEquals(baseURL + '/')
-      .assert.containsText('h1', 'Home')
+      .assert.textContains('h1', 'Home')
       .forward()
       .assert.urlEquals(baseURL + '/users/1')
-      .assert.containsText('h1', 'User #1')
+      .assert.textContains('h1', 'User #1')
       .forward()
       .assert.urlEquals(baseURL + '/')
-      .assert.containsText('h1', 'Home')
+      .assert.textContains('h1', 'Home')
       .forward()
       .assert.urlEquals(baseURL + '/users/2')
-      .assert.containsText('h1', 'User #2')
+      .assert.textContains('h1', 'User #2')
       .forward()
       .assert.urlEquals(baseURL + '/')
-      .assert.containsText('h1', 'Home')
+      .assert.textContains('h1', 'Home')
       .assert.not.visible('dialog')
       .assert.urlEquals(baseURL + '/')
       .forward()
@@ -135,19 +131,19 @@ module.exports = {
     browser
       .url(baseURL + '/')
       .waitForElementPresent('#app > *', 1000)
-      .assert.containsText('h1', 'Home')
+      .assert.textContains('h1', 'Home')
 
       .click('li:nth-child(2) button')
       .assert.visible('dialog')
       .click('dialog a')
       .assert.urlEquals(baseURL + '/about')
-      .assert.containsText('h1', 'About')
+      .assert.textContains('h1', 'About')
       .back()
       .assert.urlEquals(baseURL + '/users/1')
       .assert.visible('dialog')
       .forward()
       .assert.urlEquals(baseURL + '/about')
-      .assert.containsText('h1', 'About')
+      .assert.textContains('h1', 'About')
       .back()
       .assert.urlEquals(baseURL + '/users/1')
       .assert.visible('dialog')

diff --git a/packages/router/old-e2e/specs/multi-app.js b/packages/router/old-e2e/specs/multi-app.js
index 460e81d16ac499fab1ac40ad26b41f71d7c7ce7b..6be9197e9bf210cb4eb1b8dfa479beabea0e6b4f 100644 (file)
--- a/packages/router/old-e2e/specs/multi-app.js
+++ b/packages/router/old-e2e/specs/multi-app.js
@@ -1,10 +1,6 @@
-const bsStatus = require('../browserstack-send-status')
-
 const baseURL = 'http://localhost:3000/multi-app'
 
 module.exports = {
-  ...bsStatus(),
-
   '@tags': ['history'],
 
   /** @type {import('nightwatch').NightwatchTest} */
@@ -20,11 +16,11 @@ module.exports = {
       .waitForElementPresent('#app-1 > *', 1000)
       .waitForElementPresent('#app-2 > *', 1000)
       .waitForElementPresent('#app-3 > *', 1000)
-      .assert.containsText('#popcount', '1')
-      .assert.containsText('#guardcount', '1')
+      .assert.textContains('#popcount', '1')
+      .assert.textContains('#guardcount', '1')
 
       // they should all be displaying the home page
-      .assert.containsText('#app-1 .home', 'Home')
+      .assert.textContains('#app-1 .home', 'Home')
       .assert.cssClassPresent(
         '#app-1 li:nth-child(1) a',
         'router-link-exact-active'
@@ -34,7 +30,7 @@ module.exports = {
         'router-link-active'
       )
 
-      .assert.containsText('#app-2 .home', 'Home')
+      .assert.textContains('#app-2 .home', 'Home')
       .assert.cssClassPresent(
         '#app-2 li:nth-child(1) a',
         'router-link-exact-active'
@@ -44,7 +40,7 @@ module.exports = {
         'router-link-active'
       )
 
-      .assert.containsText('#app-3 .home', 'Home')
+      .assert.textContains('#app-3 .home', 'Home')
       .assert.cssClassPresent(
         '#app-3 li:nth-child(1) a',
         'router-link-exact-active'
@@ -56,44 +52,44 @@ module.exports = {
 
       // navigation on app 1
       .click('#app-1 li:nth-child(2) a')
-      .assert.containsText('#guardcount', '2')
-      .assert.containsText('#app-1 .user', 'User 1')
-      .assert.containsText('#app-2 .user', 'User 1')
-      .assert.containsText('#app-3 .user', 'User 1')
+      .assert.textContains('#guardcount', '2')
+      .assert.textContains('#app-1 .user', 'User 1')
+      .assert.textContains('#app-2 .user', 'User 1')
+      .assert.textContains('#app-3 .user', 'User 1')
 
       // navigation on app 2
       .click('#app-2 li:nth-child(3) a')
-      .assert.containsText('#guardcount', '3')
-      .assert.containsText('#app-1 .user', 'User 2')
-      .assert.containsText('#app-2 .user', 'User 2')
-      .assert.containsText('#app-3 .user', 'User 2')
+      .assert.textContains('#guardcount', '3')
+      .assert.textContains('#app-1 .user', 'User 2')
+      .assert.textContains('#app-2 .user', 'User 2')
+      .assert.textContains('#app-3 .user', 'User 2')
 
       // should trigger the guard only once
       .back()
-      .assert.containsText('#guardcount', '4')
+      .assert.textContains('#guardcount', '4')
 
       // unmounting apps should pause guards
       // start by navigating 3 times
       .click('#app-1 li:nth-child(1) a')
       .click('#app-1 li:nth-child(2) a')
       .click('#app-1 li:nth-child(1) a')
-      .assert.containsText('#guardcount', '7')
+      .assert.textContains('#guardcount', '7')
       .click('#unmount1')
       .click('#unmount2')
-      .assert.containsText('#guardcount', '7')
+      .assert.textContains('#guardcount', '7')
       .back()
       // one app is still mounted
-      .assert.containsText('#guardcount', '8')
+      .assert.textContains('#guardcount', '8')
       .click('#unmount3')
       .back()
-      .assert.containsText('#guardcount', '8')
+      .assert.textContains('#guardcount', '8')
 
       // mounting again should add the listeners again
       .click('#mount1')
       // the initial navigation
-      .assert.containsText('#guardcount', '9')
+      .assert.textContains('#guardcount', '9')
       .click('#app-1 li:nth-child(2) a')
-      .assert.containsText('#guardcount', '10')
+      .assert.textContains('#guardcount', '10')
 
       .end()
   },
@@ -106,19 +102,19 @@ module.exports = {
 
       // mount multiple apps and expect to have one listener only
       .click('#mount1')
-      .assert.containsText('#app-1 .home', 'Home')
+      .assert.textContains('#app-1 .home', 'Home')
       // toggle multiple times
       .click('#app-1 li:nth-child(2) a')
-      .assert.containsText('#part-1 .count', '0')
+      .assert.textContains('#part-1 .count', '0')
       .click('#app-1 li:nth-child(3) a')
-      .assert.containsText('#part-1 .count', '1')
+      .assert.textContains('#part-1 .count', '1')
       .click('#mount2')
-      .assert.containsText('#app-2 .user', 'User')
+      .assert.textContains('#app-2 .user', 'User')
       .click('#app-1 li:nth-child(2) a')
       // first one keeps updating
-      .assert.containsText('#part-1 .count', '2')
+      .assert.textContains('#part-1 .count', '2')
       // second app only updated once
-      .assert.containsText('#part-2 .count', '1')
+      .assert.textContains('#part-2 .count', '1')
       .click('#mount3')
   },
 }

diff --git a/packages/router/old-e2e/specs/scroll-behavior.js b/packages/router/old-e2e/specs/scroll-behavior.js
index 81df93f9f591854982fb39cd1a32167d175bcead..60e78c00d899c47016bbec97767d0c5833675d2b 100644 (file)
--- a/packages/router/old-e2e/specs/scroll-behavior.js
+++ b/packages/router/old-e2e/specs/scroll-behavior.js
@@ -1,8 +1,4 @@
-const bsStatus = require('../browserstack-send-status')
-
 module.exports = {
-  ...bsStatus(),
-
   '@tags': ['history'],
 
   /** @type {import('nightwatch').NightwatchTest} */
@@ -13,20 +9,20 @@ module.exports = {
       .url('http://localhost:3000/scroll-behavior/')
       .waitForElementPresent('#app > *', 1000)
       .assert.count('li a', 6)
-      .assert.containsText('.view', 'home')
+      .assert.textContains('.view', 'home')
 
       .execute(function () {
         window.scrollTo(0, 100)
       })
       .click('li:nth-child(2) a')
       .waitForElementPresent('.view.foo', TIMEOUT)
-      .assert.containsText('.view', 'foo')
+      .assert.textContains('.view', 'foo')
       .execute(function () {
         window.scrollTo(0, 200)
         window.history.back()
       })
       .waitForElementPresent('.view.home', TIMEOUT)
-      .assert.containsText('.view', 'home')
+      .assert.textContains('.view', 'home')
       .assert.evaluate(
         function () {
           return window.pageYOffset === 100
@@ -41,7 +37,7 @@ module.exports = {
         window.history.forward()
       })
       .waitForElementPresent('.view.foo', TIMEOUT)
-      .assert.containsText('.view', 'foo')
+      .assert.textContains('.view', 'foo')
       .assert.evaluate(
         function () {
           return window.pageYOffset === 200
@@ -54,7 +50,7 @@ module.exports = {
         window.history.back()
       })
       .waitForElementPresent('.view.home', TIMEOUT)
-      .assert.containsText('.view', 'home')
+      .assert.textContains('.view', 'home')
       .assert.evaluate(
         function () {
           return window.pageYOffset === 50

diff --git a/packages/router/old-e2e/specs/suspense.js b/packages/router/old-e2e/specs/suspense.js
index a4174c3a46daaa56f44a4345082d5a9653ea40f6..e478128e0bc11f143b411cd76ec4c52bf4886f2c 100644 (file)
--- a/packages/router/old-e2e/specs/suspense.js
+++ b/packages/router/old-e2e/specs/suspense.js
@@ -1,8 +1,4 @@
-const bsStatus = require('../browserstack-send-status')
-
 module.exports = {
-  ...bsStatus(),
-
   '@tags': [],
 
   /** @type {import('nightwatch').NightwatchTest} */

diff --git a/packages/router/old-e2e/specs/transitions.js b/packages/router/old-e2e/specs/transitions.js
index 5128d56eb96f7ae39fe50ce4c758891be23f5593..11c597fb59b27132c2d6c7e700dfe6ade062c75b 100644 (file)
--- a/packages/router/old-e2e/specs/transitions.js
+++ b/packages/router/old-e2e/specs/transitions.js
@@ -1,8 +1,4 @@
-const bsStatus = require('../browserstack-send-status')
-
 module.exports = {
-  ...bsStatus(),
-
   '@tags': ['no-headless'],
 
   transitions: function (browser) {
@@ -59,11 +55,11 @@ module.exports = {
       .click('#toggle-transition')
 
       .click('li:nth-child(7) a')
-      .assert.containsText('.nested-view', 'foo')
+      .assert.textContains('.nested-view', 'foo')
       .click('li:nth-child(1) a')
       .waitForElementPresent('.view.home', 1000)
       .click('li:nth-child(7) a')
-      .assert.containsText('.nested-view', 'foo')
+      .assert.textContains('.nested-view', 'foo')
 
       .end()
   },

diff --git a/packages/router/old-e2e/suspense/index.ts b/packages/router/old-e2e/suspense/index.ts
index edf08fa8ed0ff4c72e4a4bb4407562bbb1569be9..ba228d399b81bd859ec65b9c0e35b5d8397c7ce8 100644 (file)
--- a/packages/router/old-e2e/suspense/index.ts
+++ b/packages/router/old-e2e/suspense/index.ts
@@ -6,7 +6,7 @@ import {
   onBeforeRouteLeave,
   RouterView,
   useRoute,
-} from '../../src'
+} from 'vue-router'
 import {
   createApp,
   ref,

diff --git a/packages/router/old-e2e/transitions/index.ts b/packages/router/old-e2e/transitions/index.ts
index 811260fd6041b86b2a599eae27ba41e11b6056b5..a8e3e4e77257313615f952a39b5f21a67844d4aa 100644 (file)
--- a/packages/router/old-e2e/transitions/index.ts
+++ b/packages/router/old-e2e/transitions/index.ts
@@ -1,6 +1,5 @@
 import '../global.css'
-import { createRouter, createWebHistory } from '../../src'
-import { RouteComponent } from '../../src/types'
+import { RouteComponent, createRouter, createWebHistory } from 'vue-router'
 import { createApp, defineComponent, nextTick, ref } from 'vue'
 
 // const delay = (t: number) => new Promise(r => setTimeout(r, t))