Check for NOT connect-proxy

This commit is contained in:
John Cowen 2018-06-20 20:54:27 +01:00 committed by Jack Pearkes
parent ceabb8b439
commit 9e3f3780fa
4 changed files with 46 additions and 2 deletions

View File

@ -25,7 +25,7 @@ export default Route.extend(WithIntentionActions, {
...model, ...model,
...{ ...{
items: [{ Name: '*' }].concat( items: [{ Name: '*' }].concat(
model.items.toArray().filter(item => get(item, 'Kind') === 'consul') model.items.toArray().filter(item => get(item, 'Kind') !== 'connect-proxy')
), ),
}, },
}; };

View File

@ -19,7 +19,7 @@ export default Route.extend(WithAclActions, {
...model, ...model,
...{ ...{
items: [{ Name: '*' }].concat( items: [{ Name: '*' }].concat(
model.items.toArray().filter(item => get(item, 'Kind') === 'consul') model.items.toArray().filter(item => get(item, 'Kind') !== 'connect-proxy')
), ),
}, },
}; };

View File

@ -0,0 +1,34 @@
@setupApplicationTest
Feature: dc / intentions / filtered select: Intention Service Select Dropdowns
In order to use services as intention sources and destinations
As a user
I want to be able to choose see existing services in the dropdown, but not existing proxy services
Scenario: Opening the [Name] dropdown with 2 services and 2 proxy services
Given 1 datacenter model with the value "datacenter"
And 4 service models from yaml
---
- Name: service-0
Kind: consul
- Name: service-1
Kind: consul
- Name: service-2
Kind: connect-proxy
- Name: service-3
Kind: connect-proxy
---
When I visit the intention page for yaml
---
dc: datacenter
intention: intention
---
Then the url should be /datacenter/intentions/intention
And I click "[data-test-[Name]-element] .ember-power-select-trigger"
Then I see "* (All Services)" in ".ember-power-select-option:nth-last-child(3)"
Then I see "service-0" in ".ember-power-select-option:nth-last-child(2)"
Then I see "service-1" in ".ember-power-select-option:last-child"
Where:
---------------
| Name |
| source |
| destination |
---------------

View File

@ -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);
});
}