javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 03:00:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(): resolve merge conflict with vue test app

Browse Source
This commit is contained in:
Liam DeBeasi
2021-08-18 09:44:34 -04:00
parent 4c06814494
commit 79e780e511
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/vue/test-app/tests/e2e/specs/routing.js
View File

@ -192,7 +192,6 @@ describe('Routing', () => {
cy.ionBackButtonHidden('home'); cy.ionBackButtonHidden('home');
}); });
<<<<<<< HEAD
// Verifies fix for https://github.com/ionic-team/ionic-framework/issues/22662 // Verifies fix for https://github.com/ionic-team/ionic-framework/issues/22662
it('should push a new instance of a parameterized page so there is a transition', () => { it('should push a new instance of a parameterized page so there is a transition', () => {
cy.visit('http://localhost:8080'); cy.visit('http://localhost:8080');
@ -209,7 +208,8 @@ describe('Routing', () => {
cy.ionPageVisible('routingparameter-123') cy.ionPageVisible('routingparameter-123')
cy.ionPageDoesNotExist('routingparameter-456'); cy.ionPageDoesNotExist('routingparameter-456');
======= });
it('should select correct view when using router.go()', () => { it('should select correct view when using router.go()', () => {
cy.visit('http://localhost:8080'); cy.visit('http://localhost:8080');
@ -333,7 +333,6 @@ describe('Routing', () => {
cy.ionPageVisible('home'); cy.ionPageVisible('home');
cy.ionPageDoesNotExist('routing'); cy.ionPageDoesNotExist('routing');
cy.ionPageDoesNotExist('routingparameter'); cy.ionPageDoesNotExist('routingparameter');
>>>>>>> origin/main
}) })
}); });