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(installWizard): Fix client default values not set #13726

Merged
merged 5 commits into from
Jun 18, 2019
Merged

fix(installWizard): Fix client default values not set #13726

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e32a1b1
fix(installWizard): Fix client default values not set
BYK Jun 18, 2019
adeaa04
Use correct values
BYK Jun 18, 2019
f933460
fix logic
BYK Jun 18, 2019
fe237a7
fix tests
BYK Jun 18, 2019
95595e6
fix blunders
BYK Jun 18, 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: 1 addition & 1 deletion .nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.15.1
8.16.0
BYK marked this conversation as resolved.
Show resolved Hide resolved
20 changes: 10 additions & 10 deletions tests/js/spec/views/__snapshots__/installWizard.spec.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,10 +247,10 @@ exports[`InstallWizard renders 1`] = `
key="mail.username"
label="SMTP Username"
name="mail.username"
required={false}
required={true}
>
<div
className="control-group"
className="control-group required"
>
<div
className="controls"
Expand All @@ -267,7 +267,7 @@ exports[`InstallWizard renders 1`] = `
id="id-mail.username"
name="mail.username"
onChange={[Function]}
required={false}
required={true}
type="text"
value=""
/>
Expand All @@ -285,10 +285,10 @@ exports[`InstallWizard renders 1`] = `
key="mail.password"
label="SMTP Password"
name="mail.password"
required={false}
required={true}
>
<div
className="control-group"
className="control-group required"
>
<div
className="controls"
Expand All @@ -305,7 +305,7 @@ exports[`InstallWizard renders 1`] = `
id="id-mail.password"
name="mail.password"
onChange={[Function]}
required={false}
required={true}
type="text"
value=""
/>
Expand All @@ -324,7 +324,7 @@ exports[`InstallWizard renders 1`] = `
key="mail.use-tls"
label="Use TLS?"
name="mail.use-tls"
required={false}
required={true}
>
<div
className="control-group checkbox"
Expand Down Expand Up @@ -367,7 +367,7 @@ exports[`InstallWizard renders 1`] = `
key="auth.allow-registration"
label="Allow Registration"
name="auth.allow-registration"
required={false}
required={true}
>
<div
className="control-group checkbox"
Expand Down Expand Up @@ -431,12 +431,12 @@ exports[`InstallWizard renders 1`] = `
label="Usage Statistics"
name="beacon.anonymous"
noLabel="Send my contact information along with usage statistics"
required={false}
required={true}
yesFirst={false}
yesLabel="Please keep my usage information anonymous"
>
<div
className="control-group"
className="control-group required"
>
<div
className="controls"
Expand Down
2 changes: 1 addition & 1 deletion tests/js/spec/views/admin/__snapshots__/adminSettings.spec.jsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ exports[`AdminSettings render() renders 1`] = `
label="Root URL"
name="system.url-prefix"
placeholder="https://sentry.example.com"
required={false}
required={true}
/>
<EmailField
allowEmpty={false}
Expand Down
6 changes: 3 additions & 3 deletions tests/js/spec/views/installWizard.spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,14 @@ describe('InstallWizard', function() {

expect(
wrapper.find('input[name="beacon.anonymous"][value="false"]').prop('checked')
).toBe(true);
).toBe(false);
BYK marked this conversation as resolved.
Show resolved Hide resolved

expect(
wrapper.find('input[name="beacon.anonymous"][value="true"]').prop('checked')
).toBe(false);
});

it('has "Please keep my usage anonymous" when beacon.anonymous is true', function() {
it('has "Please keep my usage anonymous" when beacon.anonymous is false', function() {
MockApiClient.addMockResponse({
url: '/internal/options/?query=is:required',
body: TestStubs.InstallWizard({
Expand All @@ -112,6 +112,6 @@ describe('InstallWizard', function() {

expect(
wrapper.find('input[name="beacon.anonymous"][value="true"]').prop('checked')
).toBe(true);
).toBe(false);
});
});