Skip to content

Commit 9eaafc8

Browse files
kaxcodekaxcode
committed
Fix up tests to not use Kind in service models
1 parent 2c3c57d commit 9eaafc8

File tree

8 files changed

+84
-72
lines changed

8 files changed

+84
-72
lines changed

‎ui-v2/tests/acceptance/components/catalog-filter.feature

+8-4
Original file line numberDiff line numberDiff line change
@@ -127,26 +127,30 @@ Feature: components / catalog-filter
127127
-------------------------------------------------
128128
Scenario: Freetext filtering the service listing
129129
Given 1 datacenter model with the value "dc-1"
130-
And 3 service models from yaml
130+
And 6 service models from yaml
131131
---
132132
- Name: Service-0
133-
Kind: consul
134133
Tags: ['one', 'two', 'three']
135134
ChecksPassing: 0
136135
ChecksWarning: 0
137136
ChecksCritical: 1
137+
- Name: Service-0-proxy
138+
Kind: 'connect-proxy'
138139
- Name: Service-1
139-
Kind: consul
140140
Tags: ['two', 'three']
141141
ChecksPassing: 0
142142
ChecksWarning: 1
143143
ChecksCritical: 0
144+
- Name: Service-1-proxy
145+
Kind: 'connect-proxy'
144146
- Name: Service-2
145-
Kind: consul
146147
Tags: ['three']
147148
ChecksPassing: 1
148149
ChecksWarning: 0
149150
ChecksCritical: 0
151+
- Name: Service-2-proxy
152+
Kind: 'connect-proxy'
153+
150154
---
151155
When I visit the services page for yaml
152156
---

‎ui-v2/tests/acceptance/dc/error.feature

+7-4
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@ Feature: dc / error: Recovering from a dc 500 error
66
- dc-1
77
- dc-500
88
---
9-
And 3 service models from yaml
9+
And 6 service models from yaml
1010
---
1111
- Name: Service-0
12-
Kind: consul
12+
- Name: Service-0-proxy
13+
Kind: 'connect-proxy'
1314
- Name: Service-1
14-
Kind: consul
15+
- Name: Service-1-proxy
16+
Kind: 'connect-proxy'
1517
- Name: Service-2
16-
Kind: consul
18+
- Name: Service-2-proxy
19+
Kind: 'connect-proxy'
1720
---
1821
And the url "/v1/internal/ui/services" responds with a 500 status
1922
When I visit the services page for yaml

‎ui-v2/tests/acceptance/dc/nspaces/manage.feature

+13-7
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,26 @@ Feature: dc / nspaces / manage : Managing Namespaces
1313
---
1414
- dc-1
1515
---
16-
And 6 service models from yaml
16+
And 12 service models from yaml
1717
---
1818
- Name: Service-0
19-
Kind: consul
19+
- Name: Service-0-proxy
20+
Kind: 'connect-proxy'
2021
- Name: Service-1
21-
Kind: consul
22+
- Name: Service-1-proxy
23+
Kind: 'connect-proxy'
2224
- Name: Service-2
23-
Kind: consul
25+
- Name: Service-2-proxy
26+
Kind: 'connect-proxy'
2427
- Name: Service-3
25-
Kind: consul
28+
- Name: Service-3-proxy
29+
Kind: 'connect-proxy'
2630
- Name: Service-4
27-
Kind: consul
31+
- Name: Service-4-proxy
32+
Kind: 'connect-proxy'
2833
- Name: Service-5
29-
Kind: consul
34+
- Name: Service-5-proxy
35+
Kind: 'connect-proxy'
3036
---
3137

3238
When I visit the services page for yaml

‎ui-v2/tests/acceptance/dc/services/dc-switch.feature

+14-7
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,28 @@ Feature: dc / services / dc-switch : Switching Datacenters
66
- dc-1
77
- dc-2
88
---
9-
And 6 service models from yaml
9+
And 12 service models from yaml
1010
---
1111
- Name: Service-0
12-
Kind: consul
12+
- Name: Service-0-proxy
13+
Kind: 'connect-proxy'
1314
- Name: Service-1
14-
Kind: consul
15+
- Name: Service-1-proxy
16+
Kind: 'connect-proxy'
1517
- Name: Service-2
16-
Kind: consul
18+
- Name: Service-2-proxy
19+
Kind: 'connect-proxy'
1720
- Name: Service-3
18-
Kind: consul
21+
- Name: Service-3-proxy
22+
Kind: 'connect-proxy'
1923
- Name: Service-4
20-
Kind: consul
24+
- Name: Service-4-proxy
25+
Kind: 'connect-proxy'
2126
- Name: Service-5
22-
Kind: consul
27+
- Name: Service-5-proxy
28+
Kind: 'connect-proxy'
2329
---
30+
2431
When I visit the services page for yaml
2532
---
2633
dc: dc-1

‎ui-v2/tests/acceptance/dc/services/index.feature

+28-22
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,42 @@
22
Feature: dc / services / index: List Services
33
Scenario:
44
Given 1 datacenter model with the value "dc-1"
5-
And 4 service models from yaml
5+
And 10 service models from yaml
66
---
7-
- Name: Service 1
8-
Kind: consul
9-
ExternalSources:
10-
- consul
11-
- Name: Service 2
12-
Kind: consul
13-
ExternalSources:
14-
- nomad
15-
- Name: Service 3
16-
Kind: consul
17-
ExternalSources:
18-
- terraform
19-
- Name: Service 4
20-
Kind: consul
21-
ExternalSources:
22-
- kubernetes
23-
- Name: Service 5
24-
Kind: consul
25-
ExternalSources:
26-
- aws
7+
- Name: Service-0
8+
ExternalSources:
9+
- consul
10+
- Name: Service-0-proxy
11+
Kind: 'connect-proxy'
12+
- Name: Service-1
13+
ExternalSources:
14+
- nomad
15+
- Name: Service-1-proxy
16+
Kind: 'connect-proxy'
17+
- Name: Service-2
18+
ExternalSources:
19+
- terraform
20+
- Name: Service-2-proxy
21+
Kind: 'connect-proxy'
22+
- Name: Service-3
23+
ExternalSources:
24+
- kubernetes
25+
- Name: Service-3-proxy
26+
Kind: 'connect-proxy'
27+
- Name: Service-4
28+
ExternalSources:
29+
- aws
30+
- Name: Service-4-proxy
31+
Kind: 'connect-proxy'
2732
---
33+
2834
When I visit the services page for yaml
2935
---
3036
dc: dc-1
3137
---
3238
Then the url should be /dc-1/services
3339
And the title should be "Services - Consul"
34-
Then I see 4 service models
40+
Then I see 5 service models
3541
And I see externalSource on the services like yaml
3642
---
3743
- consul

‎ui-v2/tests/acceptance/dc/services/list-blocking.feature

+7-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22
Feature: dc / services / list blocking
33
Scenario: Viewing the listing pages for service
44
Given 1 datacenter model with the value "dc-1"
5-
Given 3 service models from yaml
5+
And 6 service models from yaml
66
---
77
- Name: Service-0
8-
Kind: consul
8+
- Name: Service-0-proxy
9+
Kind: 'connect-proxy'
910
- Name: Service-1
10-
Kind: consul
11+
- Name: Service-1-proxy
12+
Kind: 'connect-proxy'
1113
- Name: Service-2
12-
Kind: consul
14+
- Name: Service-2-proxy
15+
Kind: 'connect-proxy'
1316
---
1417
And a network latency of 100
1518
When I visit the services page for yaml

‎ui-v2/tests/acceptance/dc/services/list.feature

+7-4
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22
Feature: dc / services / list
33
Scenario: Listing service
44
Given 1 datacenter model with the value "dc-1"
5-
And 3 service models from yaml
5+
And 6 service models from yaml
66
---
77
- Name: Service-0
8-
Kind: consul
8+
- Name: Service-0-proxy
9+
Kind: 'connect-proxy'
910
- Name: Service-1
10-
Kind: consul
11+
- Name: Service-1-proxy
12+
Kind: 'connect-proxy'
1113
- Name: Service-2
12-
Kind: consul
14+
- Name: Service-2-proxy
15+
Kind: 'connect-proxy'
1316
---
1417
When I visit the services page for yaml
1518
---

‎ui-v2/tests/acceptance/dc/services/show-routing.feature

-20
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Feature: dc / services / Show Routing for Service
66
And 1 service model from yaml
77
---
88
- Service:
9-
Kind: consul
109
Name: service-0
1110
ID: service-0-with-id
1211
---
@@ -17,31 +16,12 @@ Feature: dc / services / Show Routing for Service
1716
---
1817
And the title should be "service-0 - Consul"
1918
And I see routing on the tabs
20-
Scenario: Given a service proxy, the Routing tab should not display
21-
Given 1 datacenter model with the value "dc1"
22-
And 1 node models
23-
And 1 service model from yaml
24-
---
25-
- Service:
26-
Kind: connect-proxy
27-
Name: service-0-proxy
28-
ID: service-0-proxy-with-id
29-
---
30-
When I visit the service page for yaml
31-
---
32-
dc: dc1
33-
service: service-0-proxy
34-
---
35-
And the title should be "service-0-proxy - Consul"
36-
And I don't see routing on the tabs
37-
3819
Scenario: Given connect is disabled, the Routing tab should not display or error
3920
Given 1 datacenter model with the value "dc1"
4021
And 1 node models
4122
And 1 service model from yaml
4223
---
4324
- Service:
44-
Kind: consul
4525
Name: service-0
4626
ID: service-0-with-id
4727
---

0 commit comments

Comments
 (0)