Skip to content

Commit 058217f

Browse files
posvaposva
committed
style(lint): fix eslint config
1 parent b770d88 commit 058217f

24 files changed

+74
-65
lines changed

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"dev": "node examples/server.js",
2929
"dev:dist": "rollup -wm -c build/rollup.dev.config.js",
3030
"build": "node build/build.js",
31-
"lint": "eslint src examples",
31+
"lint": "eslint src test examples",
3232
"test": "npm run lint && npm run flow && npm run test:unit && npm run test:e2e && npm run test:types",
3333
"flow": "flow check",
3434
"test:unit": "jasmine JASMINE_CONFIG_PATH=test/unit/jasmine.json",

Diff for: ‎test/.eslintrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"env": {
3+
"jasmine": true
4+
}
5+
}

Diff for: ‎test/e2e/.eslintrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"env": {
3+
"browser": true
4+
}
5+
}

Diff for: ‎test/e2e/runner.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
var path = require('path')
21
var spawn = require('cross-spawn')
32
var args = process.argv.slice(2)
43

Diff for: ‎test/e2e/specs/active-links.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
module.exports = {
33
'active links': function (browser) {
44
browser
5-
.url('http://localhost:8080/active-links/')
5+
.url('http://localhost:8080/active-links/')
66
.waitForElementVisible('#app', 1000)
77
.assert.count('li a', 11)
88
// assert correct href with base

Diff for: ‎test/e2e/specs/auth-flow.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
'auth flow': function (browser) {
33
browser
4-
.url('http://localhost:8080/auth-flow/')
4+
.url('http://localhost:8080/auth-flow/')
55
.waitForElementVisible('#app', 1000)
66
.assert.containsText('#app p', 'You are logged out')
77

@@ -21,7 +21,7 @@ module.exports = {
2121
.assert.containsText('#app p', 'Yay you made it!')
2222

2323
// reload
24-
.url('http://localhost:8080/auth-flow/')
24+
.url('http://localhost:8080/auth-flow/')
2525
.waitForElementVisible('#app', 1000)
2626
.assert.containsText('#app p', 'You are logged in')
2727

@@ -32,7 +32,7 @@ module.exports = {
3232
.assert.containsText('#app p', 'Yay you made it!')
3333

3434
// directly visit dashboard when logged in
35-
.url('http://localhost:8080/auth-flow/dashboard')
35+
.url('http://localhost:8080/auth-flow/dashboard')
3636
.waitForElementVisible('#app', 1000)
3737
.assert.urlEquals('http://localhost:8080/auth-flow/dashboard')
3838
.assert.containsText('#app h2', 'Dashboard')
@@ -44,7 +44,7 @@ module.exports = {
4444
.assert.containsText('#app p', 'You are logged out')
4545

4646
// directly visit dashboard when logged out
47-
.url('http://localhost:8080/auth-flow/dashboard')
47+
.url('http://localhost:8080/auth-flow/dashboard')
4848
.waitForElementVisible('#app', 1000)
4949
.assert.urlEquals('http://localhost:8080/auth-flow/login?redirect=%2Fdashboard')
5050
.assert.containsText('#app h2', 'Login')

Diff for: ‎test/e2e/specs/basic.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
basic: function (browser) {
33
browser
4-
.url('http://localhost:8080/basic/')
4+
.url('http://localhost:8080/basic/')
55
.waitForElementVisible('#app', 1000)
66
.assert.count('li', 5)
77
.assert.count('li a', 5)
@@ -34,10 +34,10 @@ module.exports = {
3434
.assert.containsText('.view', 'unicode')
3535

3636
// check initial visit
37-
.url('http://localhost:8080/basic/foo')
37+
.url('http://localhost:8080/basic/foo')
3838
.waitForElementVisible('#app', 1000)
3939
.assert.containsText('.view', 'foo')
40-
.url('http://localhost:8080/basic/%C3%A9')
40+
.url('http://localhost:8080/basic/%C3%A9')
4141
.waitForElementVisible('#app', 1000)
4242
.assert.containsText('.view', 'unicode')
4343
.end()

Diff for: ‎test/e2e/specs/data-fetching.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
'data fetching': function (browser) {
33
browser
4-
.url('http://localhost:8080/data-fetching/')
4+
.url('http://localhost:8080/data-fetching/')
55
.waitForElementVisible('#app', 1000)
66
.assert.count('li a', 4)
77
.assert.containsText('.view', 'home')

Diff for: ‎test/e2e/specs/hash-mode.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
'Hash mode': function (browser) {
33
browser
4-
.url('http://localhost:8080/hash-mode/')
4+
.url('http://localhost:8080/hash-mode/')
55
.waitForElementVisible('#app', 1000)
66
.assert.count('li', 5)
77
.assert.count('li a', 4)
@@ -28,10 +28,10 @@ module.exports = {
2828
.assert.containsText('.view', 'bar')
2929

3030
// check initial visit
31-
.url('http://localhost:8080/hash-mode/#/foo')
31+
.url('http://localhost:8080/hash-mode/#/foo')
3232
.waitForElementVisible('#app', 1000)
3333
.assert.containsText('.view', 'foo')
34-
.url('http://localhost:8080/hash-mode/#/%C3%A9')
34+
.url('http://localhost:8080/hash-mode/#/%C3%A9')
3535
.waitForElementVisible('#app', 1000)
3636
.assert.containsText('.view', 'unicode')
3737
.end()

Diff for: ‎test/e2e/specs/hash-scroll-behavior.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
'scroll behavior': function (browser) {
33
browser
4-
.url('http://localhost:8080/hash-scroll-behavior/')
4+
.url('http://localhost:8080/hash-scroll-behavior/')
55
.waitForElementVisible('#app', 1000)
66
.assert.count('li a', 5)
77
.assert.containsText('.view', 'home')

Diff for: ‎test/e2e/specs/lazy-loading.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
'lazy loading': function (browser) {
33
browser
4-
.url('http://localhost:8080/lazy-loading/')
4+
.url('http://localhost:8080/lazy-loading/')
55
.waitForElementVisible('#app', 1000)
66
.assert.count('li a', 4)
77
.assert.containsText('.view', 'home')
@@ -20,11 +20,11 @@ module.exports = {
2020
.assert.containsText('.view h3', 'Baz')
2121

2222
// test initial visit
23-
.url('http://localhost:8080/lazy-loading/foo')
23+
.url('http://localhost:8080/lazy-loading/foo')
2424
.waitForElementVisible('#app', 1000)
2525
.assert.containsText('.view', 'This is Foo!')
2626

27-
.url('http://localhost:8080/lazy-loading/bar/baz')
27+
.url('http://localhost:8080/lazy-loading/bar/baz')
2828
.waitForElementVisible('#app', 1000)
2929
.assert.containsText('.view', 'This is Bar!')
3030
.assert.containsText('.view h3', 'Baz')

Diff for: ‎test/e2e/specs/named-routes.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
'named routes': function (browser) {
33
browser
4-
.url('http://localhost:8080/named-routes/')
4+
.url('http://localhost:8080/named-routes/')
55
.waitForElementVisible('#app', 1000)
66
.assert.count('li a', 3)
77
// assert correct href with base
@@ -27,7 +27,7 @@ module.exports = {
2727
.assert.containsText('.view', 'Home')
2828

2929
// check initial visit
30-
.url('http://localhost:8080/named-routes/foo')
30+
.url('http://localhost:8080/named-routes/foo')
3131
.waitForElementVisible('#app', 1000)
3232
.assert.containsText('p', 'Current route name: foo')
3333
.assert.containsText('.view', 'Foo')

Diff for: ‎test/e2e/specs/named-views.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
'named views': function (browser) {
33
browser
4-
.url('http://localhost:8080/named-views/')
4+
.url('http://localhost:8080/named-views/')
55
.waitForElementVisible('#app', 1000)
66
.assert.count('li a', 2)
77
// assert correct href with base
@@ -25,7 +25,7 @@ module.exports = {
2525
.assert.containsText('.view.three', 'baz')
2626

2727
// check initial visit
28-
.url('http://localhost:8080/named-views/other')
28+
.url('http://localhost:8080/named-views/other')
2929
.waitForElementVisible('#app', 1000)
3030
.assert.containsText('.view.one', 'baz')
3131
.assert.containsText('.view.two', 'bar')

Diff for: ‎test/e2e/specs/navigation-guards.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
}
77

88
browser
9-
.url('http://localhost:8080/navigation-guards/')
9+
.url('http://localhost:8080/navigation-guards/')
1010
.waitForElementVisible('#app', 1000)
1111
.assert.count('li a', 8)
1212
.assert.containsText('.view', 'home')
@@ -73,7 +73,7 @@ module.exports = {
7373
.assert.containsText('.view', 'home')
7474

7575
// test initial visit
76-
.url('http://localhost:8080/navigation-guards/foo')
76+
.url('http://localhost:8080/navigation-guards/foo')
7777
.dismissAlert()
7878
.waitFor(100)
7979
.dismissAlert()
@@ -82,12 +82,12 @@ module.exports = {
8282
// and should not render anything
8383
.assert.elementNotPresent('.view')
8484

85-
.url('http://localhost:8080/navigation-guards/foo')
85+
.url('http://localhost:8080/navigation-guards/foo')
8686
.acceptAlert()
8787
.assert.urlEquals('http://localhost:8080/navigation-guards/foo')
8888
.assert.containsText('.view', 'foo')
8989

90-
.url('http://localhost:8080/navigation-guards/bar')
90+
.url('http://localhost:8080/navigation-guards/bar')
9191
.dismissAlert()
9292
.waitFor(100)
9393
.dismissAlert()
@@ -96,38 +96,38 @@ module.exports = {
9696
// and should not render anything
9797
.assert.elementNotPresent('.view')
9898

99-
.url('http://localhost:8080/navigation-guards/bar')
99+
.url('http://localhost:8080/navigation-guards/bar')
100100
.acceptAlert()
101101
.assert.urlEquals('http://localhost:8080/navigation-guards/bar')
102102
.assert.containsText('.view', 'bar')
103103

104104
// in-component guard
105-
.click('li:nth-child(5) a')
105+
.click('li:nth-child(5) a')
106106
.assert.urlEquals('http://localhost:8080/navigation-guards/bar')
107107
.assert.containsText('.view', 'bar')
108108
.waitFor(300)
109109
.assert.urlEquals('http://localhost:8080/navigation-guards/qux')
110110
.assert.containsText('.view', 'Qux')
111111

112112
// async component + in-component guard
113-
.click('li:nth-child(1) a')
113+
.click('li:nth-child(1) a')
114114
.assert.urlEquals('http://localhost:8080/navigation-guards/')
115115
.assert.containsText('.view', 'home')
116-
.click('li:nth-child(6) a')
116+
.click('li:nth-child(6) a')
117117
.assert.urlEquals('http://localhost:8080/navigation-guards/')
118118
.assert.containsText('.view', 'home')
119119
.waitFor(300)
120120
.assert.urlEquals('http://localhost:8080/navigation-guards/qux-async')
121121
.assert.containsText('.view', 'Qux')
122122

123123
// beforeRouteUpdate
124-
.click('li:nth-child(7) a')
124+
.click('li:nth-child(7) a')
125125
.assert.urlEquals('http://localhost:8080/navigation-guards/quux/1')
126126
.assert.containsText('.view', 'id:1 prevId:0')
127-
.click('li:nth-child(8) a')
127+
.click('li:nth-child(8) a')
128128
.assert.urlEquals('http://localhost:8080/navigation-guards/quux/2')
129129
.assert.containsText('.view', 'id:2 prevId:1')
130-
.click('li:nth-child(7) a')
130+
.click('li:nth-child(7) a')
131131
.assert.urlEquals('http://localhost:8080/navigation-guards/quux/1')
132132
.assert.containsText('.view', 'id:1 prevId:2')
133133
.end()

Diff for: ‎test/e2e/specs/nested-router.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
'basic': function (browser) {
33
browser
4-
.url('http://localhost:8080/nested-router/')
4+
.url('http://localhost:8080/nested-router/')
55
.waitForElementVisible('#app', 1000)
66
.assert.count('li a', 3)
77

Diff for: ‎test/e2e/specs/nested-routes.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
'nested routes': function (browser) {
33
browser
4-
.url('http://localhost:8080/nested-routes/')
4+
.url('http://localhost:8080/nested-routes/')
55
.waitForElementVisible('#app', 1000)
66
.assert.count('li a', 9)
77
.assert.urlEquals('http://localhost:8080/nested-routes/parent')
@@ -71,11 +71,11 @@ module.exports = {
7171
}, null, 'relative params')
7272

7373
// check initial visit
74-
.url('http://localhost:8080/nested-routes/parent/foo')
74+
.url('http://localhost:8080/nested-routes/parent/foo')
7575
.waitForElementVisible('#app', 1000)
7676
.assert.containsText('.view', 'Parent')
7777
.assert.containsText('.view', 'foo')
78-
.url('http://localhost:8080/nested-routes/baz')
78+
.url('http://localhost:8080/nested-routes/baz')
7979
.waitForElementVisible('#app', 1000)
8080
.assert.containsText('.view', 'Parent')
8181
.assert.containsText('.view', 'baz')

Diff for: ‎test/e2e/specs/redirect.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
'redirect': function (browser) {
33
browser
4-
.url('http://localhost:8080/redirect/')
4+
.url('http://localhost:8080/redirect/')
55
.waitForElementVisible('#app', 1000)
66
.assert.count('li a', 12)
77
// assert correct href with base
@@ -69,62 +69,62 @@ module.exports = {
6969
.assert.containsText('.view', 'default')
7070

7171
// check initial visit
72-
.url('http://localhost:8080/redirect/relative-redirect')
72+
.url('http://localhost:8080/redirect/relative-redirect')
7373
.waitForElementVisible('#app', 1000)
7474
.assert.urlEquals('http://localhost:8080/redirect/foo')
7575
.assert.containsText('.view', 'foo')
7676

77-
.url('http://localhost:8080/redirect/relative-redirect?foo=bar')
77+
.url('http://localhost:8080/redirect/relative-redirect?foo=bar')
7878
.waitForElementVisible('#app', 1000)
7979
.assert.urlEquals('http://localhost:8080/redirect/foo?foo=bar')
8080
.assert.containsText('.view', 'foo')
8181

82-
.url('http://localhost:8080/redirect/absolute-redirect')
82+
.url('http://localhost:8080/redirect/absolute-redirect')
8383
.waitForElementVisible('#app', 1000)
8484
.assert.urlEquals('http://localhost:8080/redirect/bar')
8585
.assert.containsText('.view', 'bar')
8686

87-
.url('http://localhost:8080/redirect/dynamic-redirect')
87+
.url('http://localhost:8080/redirect/dynamic-redirect')
8888
.waitForElementVisible('#app', 1000)
8989
.assert.urlEquals('http://localhost:8080/redirect/bar')
9090
.assert.containsText('.view', 'bar')
9191

92-
.url('http://localhost:8080/redirect/dynamic-redirect/123')
92+
.url('http://localhost:8080/redirect/dynamic-redirect/123')
9393
.waitForElementVisible('#app', 1000)
9494
.assert.urlEquals('http://localhost:8080/redirect/with-params/123')
9595
.assert.containsText('.view', '123')
9696

97-
.url('http://localhost:8080/redirect/dynamic-redirect?to=foo')
97+
.url('http://localhost:8080/redirect/dynamic-redirect?to=foo')
9898
.waitForElementVisible('#app', 1000)
9999
.assert.urlEquals('http://localhost:8080/redirect/foo')
100100
.assert.containsText('.view', 'foo')
101101

102-
.url('http://localhost:8080/redirect/dynamic-redirect#baz')
102+
.url('http://localhost:8080/redirect/dynamic-redirect#baz')
103103
.waitForElementVisible('#app', 1000)
104104
.assert.urlEquals('http://localhost:8080/redirect/baz')
105105
.assert.containsText('.view', 'baz')
106106

107-
.url('http://localhost:8080/redirect/named-redirect')
107+
.url('http://localhost:8080/redirect/named-redirect')
108108
.waitForElementVisible('#app', 1000)
109109
.assert.urlEquals('http://localhost:8080/redirect/baz')
110110
.assert.containsText('.view', 'baz')
111111

112-
.url('http://localhost:8080/redirect/redirect-with-params/123')
112+
.url('http://localhost:8080/redirect/redirect-with-params/123')
113113
.waitForElementVisible('#app', 1000)
114114
.assert.urlEquals('http://localhost:8080/redirect/with-params/123')
115115
.assert.containsText('.view', '123')
116116

117-
.url('http://localhost:8080/redirect/foobar')
117+
.url('http://localhost:8080/redirect/foobar')
118118
.waitForElementVisible('#app', 1000)
119119
.assert.urlEquals('http://localhost:8080/redirect/foobar')
120120
.assert.containsText('.view', 'foobar')
121121

122-
.url('http://localhost:8080/redirect/FooBar')
122+
.url('http://localhost:8080/redirect/FooBar')
123123
.waitForElementVisible('#app', 1000)
124124
.assert.urlEquals('http://localhost:8080/redirect/FooBar')
125125
.assert.containsText('.view', 'FooBar')
126126

127-
.url('http://localhost:8080/redirect/not-found')
127+
.url('http://localhost:8080/redirect/not-found')
128128
.waitForElementVisible('#app', 1000)
129129
.assert.urlEquals('http://localhost:8080/redirect/')
130130
.assert.containsText('.view', 'default')

0 commit comments

Comments
 (0)