Skip to content

feat: Add codersdk.NullTime, change workspace build deadline #3552

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

Merged
merged 5 commits into from
Aug 25, 2022
Merged

feat: Add codersdk.NullTime, change workspace build deadline #3552

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ddef28
feat: Add `codersdk.NullTime`, change workspace build deadline
mafredri Aug 18, 2022
e11e186
Clean up tests
mafredri Aug 18, 2022
e390cef
fix: Site references to `workspace.latest_build.deadline`
mafredri Aug 25, 2022
fdb657e
Simplify
mafredri Aug 25, 2022
62c7b32
Update site/src/components/WorkspaceScheduleButton/WorkspaceScheduleB…
mafredri Aug 25, 2022
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
Prev Previous commit
Next Next commit
Clean up tests
  • Loading branch information
@mafredri
mafredri committed Aug 25, 2022
commit e11e18628c25ff58f78662edcc3c52fbc848b7ff
38 changes: 24 additions & 14 deletions codersdk/time_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,38 @@ func TestNullTime_MarshalJSON(t *testing.T) {
bt1, err := json.Marshal(t1)
require.NoError(t, err)

type fields struct {
time time.Time
valid bool
}
tests := []struct {
name string
fields fields
want string
name string
input sql.NullTime
want string
}{
{"valid zero", fields{time: time.Time{}, valid: true}, `"0001-01-01T00:00:00Z"`},
{"invalid zero", fields{time: time.Time{}, valid: false}, "null"},
{"valid time", fields{time: t1, valid: true}, string(bt1)},
{"null time", fields{time: t1, valid: false}, "null"},
{
name: "valid zero",
input: sql.NullTime{Valid: true},
want: `"0001-01-01T00:00:00Z"`,
},
{
name: "invalid zero",
input: sql.NullTime{Valid: false},
want: "null",
},
{
name: "valid time",
input: sql.NullTime{Time: t1, Valid: true},
want: string(bt1),
},
{
name: "null time",
input: sql.NullTime{Time: t1, Valid: false},
want: "null",
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

tr := codersdk.NewNullTime(tt.fields.time, tt.fields.valid)
tr := codersdk.NewNullTime(tt.input.Time, tt.input.Valid)
got, err := tr.MarshalJSON()
require.NoError(t, err)
require.Equal(t, tt.want, string(got))
Expand Down Expand Up @@ -78,7 +90,6 @@ func TestNullTime_UnmarshalJSON(t *testing.T) {
{
name: "empty string",
data: `{"time": ""}`,
want: codersdk.NullTime{},
wantErr: true,
},
{
Expand All @@ -89,7 +100,6 @@ func TestNullTime_UnmarshalJSON(t *testing.T) {
{
name: "invalid time",
data: fmt.Sprintf(`{"time": %q}`, `2022-08-18T00:00:00`),
want: codersdk.NullTime{},
wantErr: true,
},
}
Expand Down