From: Eduardo San Martin Morote Date: Thu, 9 Jun 2022 13:55:15 +0000 (+0200) Subject: test: refactor imports and old bsStatus X-Git-Tag: v4.1.0~48 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23f494c98a764d52398be9933fd08a4c5980ce41;p=thirdparty%2Fvuejs%2Frouter.git 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 2929c23e..f6db80d5 100644 --- 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 151742d2..27a11a3d 100644 --- 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 fe561d96..c153c4ba 100644 --- 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 aee132c1..1a59f5fc 100644 --- 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 460e81d1..6be9197e 100644 --- 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 81df93f9..60e78c00 100644 --- 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 a4174c3a..e478128e 100644 --- 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 5128d56e..11c597fb 100644 --- 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 edf08fa8..ba228d39 100644 --- 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 811260fd..a8e3e4e7 100644 --- 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))