From b5131d4de4c2e77fa44fd2a98b81eedba8413b04 Mon Sep 17 00:00:00 2001
From: zrh122 <1229550935@qq.com>
Date: Fri, 26 Apr 2019 21:29:20 +0800
Subject: [PATCH 1/2] test: split navigation guards test code into two steps

---
 test/e2e/specs/navigation-guards.js | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/test/e2e/specs/navigation-guards.js b/test/e2e/specs/navigation-guards.js
index 4b75c5aeb..655a6bc50 100644
--- a/test/e2e/specs/navigation-guards.js
+++ b/test/e2e/specs/navigation-guards.js
@@ -1,16 +1,17 @@
 module.exports = {
-  'navigation guards': function (browser) {
-    // alert commands not available in phantom
-    if (process.env.PHANTOMJS) {
-      return
-    }
-
+  'navigation guards step one': function (browser) {
     browser
       .url('http://localhost:8080/navigation-guards/')
       .waitForElementVisible('#app', 1000)
       .assert.count('li a', 8)
       .assert.containsText('.view', 'home')
 
+    // alert commands not available in phantom
+    if (process.env.PHANTOMJS) {
+      return
+    }
+
+    browser
       .click('li:nth-child(2) a')
       .dismissAlert()
       .waitFor(100)
@@ -100,16 +101,22 @@ module.exports = {
       .acceptAlert()
       .assert.urlEquals('http://localhost:8080/navigation-guards/bar')
       .assert.containsText('.view', 'bar')
+  },
+  'navigation guards step two': function (browser) {
+    browser
+      // back to home
+      .url('http://localhost:8080/navigation-guards/')
+      .assert.containsText('.view', 'home')
 
-    // in-component guard
+      // in-component guard
       .click('li:nth-child(5) a')
-      .assert.urlEquals('http://localhost:8080/navigation-guards/bar')
-      .assert.containsText('.view', 'bar')
+      .assert.urlEquals('http://localhost:8080/navigation-guards/')
+      .assert.containsText('.view', 'home')
       .waitFor(300)
       .assert.urlEquals('http://localhost:8080/navigation-guards/qux')
       .assert.containsText('.view', 'Qux')
 
-    // async component + in-component guard
+      // async component + in-component guard
       .click('li:nth-child(1) a')
       .assert.urlEquals('http://localhost:8080/navigation-guards/')
       .assert.containsText('.view', 'home')
@@ -120,7 +127,7 @@ module.exports = {
       .assert.urlEquals('http://localhost:8080/navigation-guards/qux-async')
       .assert.containsText('.view', 'Qux')
 
-    // beforeRouteUpdate
+      // beforeRouteUpdate
       .click('li:nth-child(7) a')
       .assert.urlEquals('http://localhost:8080/navigation-guards/quux/1')
       .assert.containsText('.view', 'id:1 prevId:0')

From 92e178a0f4c4129e0fb37575a0282729c5ca6623 Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Wed, 8 May 2019 19:54:47 +0200
Subject: [PATCH 2/2] test: split navigation guards tests

---
 test/e2e/specs/navigation-guards.js | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/test/e2e/specs/navigation-guards.js b/test/e2e/specs/navigation-guards.js
index 655a6bc50..099a2b483 100644
--- a/test/e2e/specs/navigation-guards.js
+++ b/test/e2e/specs/navigation-guards.js
@@ -1,5 +1,5 @@
 module.exports = {
-  'navigation guards step one': function (browser) {
+  'navigation guards with alerts': function (browser) {
     browser
       .url('http://localhost:8080/navigation-guards/')
       .waitForElementVisible('#app', 1000)
@@ -7,9 +7,7 @@ module.exports = {
       .assert.containsText('.view', 'home')
 
     // alert commands not available in phantom
-    if (process.env.PHANTOMJS) {
-      return
-    }
+    if (process.env.PHANTOMJS) return
 
     browser
       .click('li:nth-child(2) a')
@@ -64,16 +62,8 @@ module.exports = {
       .assert.urlEquals('http://localhost:8080/navigation-guards/foo')
       .assert.containsText('.view', 'foo')
 
-      .click('li:nth-child(4) a')
-      .assert.urlEquals('http://localhost:8080/navigation-guards/baz')
-      .assert.containsText('.view', 'baz (not saved)')
-      .click('button')
-      .assert.containsText('.view', 'baz (saved)')
-      .click('li:nth-child(1) a')
-      .assert.urlEquals('http://localhost:8080/navigation-guards/')
-      .assert.containsText('.view', 'home')
-
-      // test initial visit
+    // test initial visit
+    browser
       .url('http://localhost:8080/navigation-guards/foo')
       .dismissAlert()
       .waitFor(100)
@@ -102,10 +92,20 @@ module.exports = {
       .assert.urlEquals('http://localhost:8080/navigation-guards/bar')
       .assert.containsText('.view', 'bar')
   },
-  'navigation guards step two': function (browser) {
+  'navigation guards': function (browser) {
     browser
       // back to home
       .url('http://localhost:8080/navigation-guards/')
+      .waitForElementVisible('#app', 1000)
+      .assert.containsText('.view', 'home')
+
+      .click('li:nth-child(4) a')
+      .assert.urlEquals('http://localhost:8080/navigation-guards/baz')
+      .assert.containsText('.view', 'baz (not saved)')
+      .click('button')
+      .assert.containsText('.view', 'baz (saved)')
+      .click('li:nth-child(1) a')
+      .assert.urlEquals('http://localhost:8080/navigation-guards/')
       .assert.containsText('.view', 'home')
 
       // in-component guard