-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Hides the Routing tab for a service proxy
* Adds conditional in route to not make discovery-chain request if service kind is equal to `connect-proxy` or `mesh-gateway` * Adds conditional in template to not show Routing tab if `chain` returns as null * Creates a new acceptance test to test the Routing tab not being displayed for a service proxy * Adds `tabs` to the services/show page object
- Loading branch information
Showing
6 changed files
with
65 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
@setupApplicationTest | ||
Feature: dc / services / Show Routing for Serivce | ||
Scenario: Given a service, the Routing tab should display | ||
Given 1 datacenter model with the value "dc1" | ||
And 1 node models | ||
And 1 service model from yaml | ||
--- | ||
- Service: | ||
Kind: connect | ||
Name: service-0 | ||
ID: service-0-with-id | ||
--- | ||
When I visit the service page for yaml | ||
--- | ||
dc: dc1 | ||
service: service-0 | ||
--- | ||
And the title should be "service-0 - Consul" | ||
And I see routing on the tabs | ||
Scenario: Given a service proxy, the Routing tab should not display | ||
Given 1 datacenter model with the value "dc1" | ||
And 1 node models | ||
And 1 service model from yaml | ||
--- | ||
- Service: | ||
Kind: connect-proxy | ||
Name: service-0-proxy | ||
ID: service-0-proxy-with-id | ||
--- | ||
When I visit the service page for yaml | ||
--- | ||
dc: dc1 | ||
service: service-0-proxy | ||
--- | ||
And the title should be "service-0-proxy - Consul" | ||
And I don't see routing on the tabs | ||
|
10 changes: 10 additions & 0 deletions
10
ui-v2/tests/acceptance/steps/dc/services/show-routing-steps.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import steps from '../../steps'; | ||
|
||
// step definitions that are shared between features should be moved to the | ||
// tests/acceptance/steps/steps.js file | ||
|
||
export default function(assert) { | ||
return steps(assert).then('I should find a file', function() { | ||
assert.ok(true, this.step); | ||
}); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters