Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(provider/cf): Fix provider selection for resize stage in pipeline #6754

Merged
merged 3 commits into from
Apr 3, 2019
Merged

fix(provider/cf): Fix provider selection for resize stage in pipeline #6754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fda67a
fix(cf): Fix provider selection for resize stage in pipeline
jasonjchu Mar 25, 2019
bca2919
Merge branch 'master' into account-region-cluster-additional-tests
jasonjchu Mar 26, 2019
bc64b95
Merge branch 'master' into account-region-cluster-additional-tests
stuart-pollock Apr 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...s/modules/cloudfoundry/src/pipeline/stages/resizeAsg/CloudfoundryResizeAsgStageConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export interface ICloudfoundryResizeAsgStageConfigState {
application: Application;
capacity?: Partial<ICapacity>;
cloudProvider?: string;
cloudProviderType?: string;
credentials: string;
diskQuota?: number;
instanceCount?: number;
Expand Down Expand Up @@ -59,7 +58,6 @@ export class CloudfoundryResizeAsgStageConfig extends React.Component<
action: 'scale_exact',
capacity: props.stage.capacity,
cloudProvider: 'cloudfoundry',
cloudProviderType: props.stage.cloudProvider,
diskQuota: props.stage.diskQuota || 1024,
instanceCount: props.stage.instanceCount || 1,
interestingHealthProviderNames: interestingHealthProviderNames,
Expand Down
21 changes: 15 additions & 6 deletions ...c/presentation/widgets/accountRegionClusterSelector/AccountRegionClusterSelector.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ describe('<AccountRegionClusterSelector />', () => {
it('retrieves the correct list of regions when account is changed', () => {
let credentials = '';
let region = 'SHOULD-CHANGE';
let regions = ['SHOULD-CHANGE'];
let cluster = 'SHOULD-CHANGE';
const accountRegionClusterProps: IAccountRegionClusterSelectorProps = {
accounts: [
{
Expand All @@ -107,6 +109,8 @@ describe('<AccountRegionClusterSelector />', () => {
onComponentUpdate: (value: any) => {
credentials = value.credentials;
region = value.region;
regions = value.regions;
cluster = value.cluster;
},
component: {
cluster: 'app-stack-detailOne',
Expand Down Expand Up @@ -138,12 +142,15 @@ describe('<AccountRegionClusterSelector />', () => {
expect(component.state().availableRegions.length).toBe(1, 'number of available regions does not match');
expect(component.state().availableRegions).toContain('region-two');
expect(component.state().clusters.length).toBe(0, 'number of clusters does not match');
expect(region).toEqual('');
expect(region).toEqual('', 'selected region is not cleared');
expect(regions.length).toBe(0, 'selected regions list is not cleared');
expect(credentials).toContain('account-name-two');
expect(cluster).toBeUndefined('selected cluster is not cleared');
});

it('retrieves the correct list of clusters when the selector is multi-region and the region is changed', () => {
let regions: string[] = [];
let cluster = 'SHOULD-CHANGE';
const accountRegionClusterProps: IAccountRegionClusterSelectorProps = {
accounts: [
{
Expand All @@ -161,11 +168,12 @@ describe('<AccountRegionClusterSelector />', () => {
],
application,
cloudProvider: 'cloud-provider',
clusterField: 'newCluster',
onComponentUpdate: (value: any) => {
regions = value.regions;
cluster = value.newCluster;
},
component: {
cluster: 'app-stack-detailOne',
credentials: 'account-name-one',
regions: ['region-one'],
},
Expand Down Expand Up @@ -194,6 +202,7 @@ describe('<AccountRegionClusterSelector />', () => {
expect(component.state().clusters).toContain('app-stack-detailOne');
expect(component.state().clusters).toContain('app-stack-detailThree');
expect(component.state().clusters).toContain('app-stack-detailFour');
expect(cluster).toBeUndefined('selected cluster is not cleared');
expect(regions.length).toBe(2);
expect(regions).toContain('region-one');
expect(regions).toContain('region-three');
Expand Down Expand Up @@ -293,10 +302,10 @@ describe('<AccountRegionClusterSelector />', () => {
expect(component.state().clusters).toContain('app-stack-detailOne');
expect(component.state().clusters).toContain('app-stack-detailThree');

const accountSelectComponent = component.find('Select[name="newCluster"] .Select-control input');
accountSelectComponent.simulate('mouseDown');
accountSelectComponent.simulate('change', { target: { value: 'app-stack-detailThree' } });
accountSelectComponent.simulate('keyDown', { keyCode: 9, key: 'Tab' });
const clusterSelectComponent = component.find('Select[name="newCluster"] .Select-control input');
clusterSelectComponent.simulate('mouseDown');
clusterSelectComponent.simulate('change', { target: { value: 'app-stack-detailThree' } });
clusterSelectComponent.simulate('keyDown', { keyCode: 9, key: 'Tab' });
$scope.$digest();

expect(cluster).toBe('app-stack-detailThree');
Expand Down