Skip to content

Commit 949fe18

Browse files
zrh122posva
authored andcommitted
test: split navigation guards (vuejs#2749)
only prevent executing those with alerts in phantomjs but still execute the rest
1 parent d3befaa commit 949fe18

File tree

1 file changed

+28
-21
lines changed

1 file changed

+28
-21
lines changed

test/e2e/specs/navigation-guards.js

+28-21
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
module.exports = {
2-
'navigation guards': function (browser) {
3-
// alert commands not available in phantom
4-
if (process.env.PHANTOMJS) {
5-
return
6-
}
7-
2+
'navigation guards with alerts': function (browser) {
83
browser
94
.url('http://localhost:8080/navigation-guards/')
105
.waitForElementVisible('#app', 1000)
116
.assert.count('li a', 8)
127
.assert.containsText('.view', 'home')
138

9+
// alert commands not available in phantom
10+
if (process.env.PHANTOMJS) return
11+
12+
browser
1413
.click('li:nth-child(2) a')
1514
.dismissAlert()
1615
.waitFor(100)
@@ -63,16 +62,8 @@ module.exports = {
6362
.assert.urlEquals('http://localhost:8080/navigation-guards/foo')
6463
.assert.containsText('.view', 'foo')
6564

66-
.click('li:nth-child(4) a')
67-
.assert.urlEquals('http://localhost:8080/navigation-guards/baz')
68-
.assert.containsText('.view', 'baz (not saved)')
69-
.click('button')
70-
.assert.containsText('.view', 'baz (saved)')
71-
.click('li:nth-child(1) a')
72-
.assert.urlEquals('http://localhost:8080/navigation-guards/')
73-
.assert.containsText('.view', 'home')
74-
75-
// test initial visit
65+
// test initial visit
66+
browser
7667
.url('http://localhost:8080/navigation-guards/foo')
7768
.dismissAlert()
7869
.waitFor(100)
@@ -100,16 +91,32 @@ module.exports = {
10091
.acceptAlert()
10192
.assert.urlEquals('http://localhost:8080/navigation-guards/bar')
10293
.assert.containsText('.view', 'bar')
94+
},
95+
'navigation guards': function (browser) {
96+
browser
97+
// back to home
98+
.url('http://localhost:8080/navigation-guards/')
99+
.waitForElementVisible('#app', 1000)
100+
.assert.containsText('.view', 'home')
103101

104-
// in-component guard
102+
.click('li:nth-child(4) a')
103+
.assert.urlEquals('http://localhost:8080/navigation-guards/baz')
104+
.assert.containsText('.view', 'baz (not saved)')
105+
.click('button')
106+
.assert.containsText('.view', 'baz (saved)')
107+
.click('li:nth-child(1) a')
108+
.assert.urlEquals('http://localhost:8080/navigation-guards/')
109+
.assert.containsText('.view', 'home')
110+
111+
// in-component guard
105112
.click('li:nth-child(5) a')
106-
.assert.urlEquals('http://localhost:8080/navigation-guards/bar')
107-
.assert.containsText('.view', 'bar')
113+
.assert.urlEquals('http://localhost:8080/navigation-guards/')
114+
.assert.containsText('.view', 'home')
108115
.waitFor(300)
109116
.assert.urlEquals('http://localhost:8080/navigation-guards/qux')
110117
.assert.containsText('.view', 'Qux')
111118

112-
// async component + in-component guard
119+
// async component + in-component guard
113120
.click('li:nth-child(1) a')
114121
.assert.urlEquals('http://localhost:8080/navigation-guards/')
115122
.assert.containsText('.view', 'home')
@@ -120,7 +127,7 @@ module.exports = {
120127
.assert.urlEquals('http://localhost:8080/navigation-guards/qux-async')
121128
.assert.containsText('.view', 'Qux')
122129

123-
// beforeRouteUpdate
130+
// beforeRouteUpdate
124131
.click('li:nth-child(7) a')
125132
.assert.urlEquals('http://localhost:8080/navigation-guards/quux/1')
126133
.assert.containsText('.view', 'id:1 prevId:0')

0 commit comments

Comments
 (0)