Merge branch 'main' into licenseflow

coder · kylecarbs · Nov 16, 2022 · Nov 16, 2022 · Nov 16, 2022 · Nov 16, 2022
commit a4fd5050b4be32f5279888d776737a7fb4d32322
diff --git a/cli/login_test.go b/cli/login_test.go
@@ -75,7 +75,7 @@ func TestLogin(t *testing.T) {
 		// accurately detect Windows ptys when they are not attached to a process:
 		// https://github.com/mattn/go-isatty/issues/59
 		doneChan := make(chan struct{})
-		root, _ := clitest.New(t, "login", client.URL.String(), "--first-user-username", "testuser", "--first-user-email", "user@coder.com", "--first-user-password", "password")
+		root, _ := clitest.New(t, "login", client.URL.String(), "--first-user-username", "testuser", "--first-user-email", "user@coder.com", "--first-user-password", "password", "--first-user-trial")
 		pty := ptytest.New(t)
 		root.SetIn(pty.Input())
 		root.SetOut(pty.Output())

diff --git a/...se/migrations/000079_license_ids.down.sql → ...se/migrations/000080_license_ids.down.sql b/...se/migrations/000079_license_ids.down.sql → ...se/migrations/000080_license_ids.down.sql
diff --git a/...base/migrations/000079_license_ids.up.sql → ...base/migrations/000080_license_ids.up.sql b/...base/migrations/000079_license_ids.up.sql → ...base/migrations/000080_license_ids.up.sql
diff --git a/site/src/pages/SetupPage/SetupPage.test.tsx b/site/src/pages/SetupPage/SetupPage.test.tsx
@@ -12,20 +12,14 @@ const fillForm = async ({
   username = "someuser",
   email = "someone@coder.com",
   password = "password",
-  organization = "Coder",
 }: {
   username?: string
   email?: string
   password?: string
-  organization?: string
 } = {}) => {
   const usernameField = screen.getByLabelText(PageViewLanguage.usernameLabel)
   const emailField = screen.getByLabelText(PageViewLanguage.emailLabel)
   const passwordField = screen.getByLabelText(PageViewLanguage.passwordLabel)
-  const organizationField = screen.getByLabelText(
-    PageViewLanguage.organizationLabel,
-  )
-  await userEvent.type(organizationField, organization)
   await userEvent.type(usernameField, username)
   await userEvent.type(emailField, email)
   await userEvent.type(passwordField, password)

diff --git a/site/src/pages/SetupPage/SetupPageView.tsx b/site/src/pages/SetupPage/SetupPageView.tsx
@@ -100,7 +100,8 @@ export const SetupPageView: React.FC<SetupPageViewProps> = ({
             <Box display="flex">
               <div>
                 <Checkbox
-                  {...getFieldHelpers("trial")}
+                  id="trial"
+                  name="trial"
                   defaultChecked
                   value={form.values.trial}
                   onChange={form.handleChange}