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

Fix tests we missed in PR #897 #905

Merged
merged 1 commit into from
Mar 12, 2019
Merged

Fix tests we missed in PR #897 #905

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions ...avascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsActions.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ Array [
},
"transformation": Object {
"limits": Object {
"max_concurrent_tasks_per_ems": 10,
"max_concurrent_tasks_per_host": 10,
},
},
Expand Down Expand Up @@ -113,6 +114,7 @@ Array [
},
"transformation": Object {
"limits": Object {
"max_concurrent_tasks_per_ems": 10,
"max_concurrent_tasks_per_host": 10,
},
},
Expand Down
2 changes: 2 additions & 0 deletions ...avascript/react/screens/App/Settings/__tests__/__snapshots__/SettingsReducer.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ Object {
"isSavingSettings": false,
"postConversionHostsResults": Array [],
"savedSettings": Object {
"max_concurrent_tasks_per_ems": 10,
"max_concurrent_tasks_per_host": 10,
},
"savingSettingsRejected": false,
Expand Down Expand Up @@ -397,6 +398,7 @@ Object {
"isSavingSettings": false,
"postConversionHostsResults": Array [],
"savedSettings": Object {
"max_concurrent_tasks_per_ems": 10,
"max_concurrent_tasks_per_host": 10,
},
"savingSettingsRejected": false,
Expand Down
87 changes: 80 additions & 7 deletions ...App/Settings/screens/GeneralSettings/__tests__/__snapshots__/GeneralSettings.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ exports[`GeneralSettings component renders the general settings page 1`] = `
>
<Form
bsClass="form"
className="form-horizontal"
componentClass="form"
horizontal={false}
inline={false}
Expand All @@ -27,33 +28,106 @@ exports[`GeneralSettings component renders the general settings page 1`] = `
}
}
>
<div>
<h3>
Concurrent Migrations
</h3>
</div>
<FormGroup
bsClass="form-group"
>
<ControlLabel
bsClass="control-label"
className="col-md-5"
srOnly={false}
>
Maximum concurrent migrations per conversion host
<span
className="pull-left"
>
Maximum concurrent migrations per conversion host
<OverlayTrigger
defaultOverlayShown={false}
delay={500}
overlay={
<Popover
bsClass="popover"
id="maximum_concurrect_migrations_per_provider_popover"
placement="right"
>
For VDDK transformations the maximum concurrent migrations per conversion host is limited to 20. See the product documentation for more information.
</Popover>
}
placement="top"
rootClose={false}
trigger={
Array [
"hover",
]
}
>
<Icon
name="info"
size="md"
style={
Object {
"backgroundColor": "transparent",
"padding": 10,
"width": "inherit",
}
}
type="pf"
/>
</OverlayTrigger>
</span>
</ControlLabel>
<div
style={
Object {
"width": 100,
}
}
className="col-md-2"
>
<Field
component={[Function]}
id="max_concurrent_tasks_per_host"
min={1}
name="max_concurrent_tasks_per_host"
normalize={[Function]}
onChange={[Function]}
/>
</div>
</FormGroup>
<FormGroup
bsClass="form-group"
>
<ControlLabel
bsClass="control-label"
className="col-md-5"
srOnly={false}
>
<div
className="pull-left"
>
Maximum concurrent migrations per provider
</div>
</ControlLabel>
<div
className="col-md-2"
>
<Field
component={[Function]}
id="max_concurrent_tasks_per_ems"
min={1}
name="max_concurrent_tasks_per_ems"
normalize={[Function]}
onChange={[Function]}
/>
</div>
</FormGroup>
<FormGroup
bsClass="form-group"
className="col-md-1 pull-left"
style={
Object {
"marginTop": "40px",
}
}
>
<Button
active={false}
Expand All @@ -65,7 +139,6 @@ exports[`GeneralSettings component renders the general settings page 1`] = `
>
Apply
</Button>
<br />
</FormGroup>
</Form>
</div>
Expand Down
6 changes: 4 additions & 2 deletions app/javascript/react/screens/App/Settings/settings.fixures.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ export const servers = Immutable({
export const settings = Immutable({
transformation: {
limits: {
max_concurrent_tasks_per_host: 10
max_concurrent_tasks_per_host: 10,
max_concurrent_tasks_per_ems: 10
}
},
otherSettings: {
Expand All @@ -27,7 +28,8 @@ export const settings = Immutable({
});

export const settingsFormValues = Immutable({
max_concurrent_tasks_per_host: 10
max_concurrent_tasks_per_host: 10,
max_concurrent_tasks_per_ems: 10
});

export const fetchServersData = {
Expand Down