userregister test

trunk
vilmibm 2022-06-21 12:57:52 -05:00
parent 1e0eb4d13f
commit 62394e3f77
2 changed files with 49 additions and 17 deletions

View File

@ -44,8 +44,8 @@ func TestUserRegister(t *testing.T) {
ts := []struct { ts := []struct {
name string name string
req func() *http.Request req func() *http.Request
setup func(opts *config.Options) error setup func(*config.Options) error
assert func(t *testing.T) error assert func(*config.Options, *testing.T) error
wantErr *HTTPError wantErr *HTTPError
}{ }{
{ {
@ -57,12 +57,32 @@ func TestUserRegister(t *testing.T) {
Created: time.Now(), Created: time.Now(),
}) })
}, },
assert: func(t *testing.T) error { assert: func(opts *config.Options, t *testing.T) error {
// TODO ensure user count is still 1 var count int
var err error
if err = opts.DB.QueryRow("SELECT count(*) FROM users").Scan(&count); err != nil {
return err
}
if count != 1 {
t.Errorf("expected 1 user, got %d", count)
}
return nil return nil
}, },
wantErr: &HTTPError{Code: 403, Msg: "user already exists"}, wantErr: &HTTPError{Code: 403, Msg: "user already exists"},
}, },
{
name: "bad method",
req: func() *http.Request {
r, _ := http.NewRequest("GET", "", strings.NewReader(""))
return r
},
wantErr: &HTTPError{
Msg: "bad method",
Code: 400,
},
},
// TODO // TODO
} }
@ -70,7 +90,7 @@ func TestUserRegister(t *testing.T) {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {
var req *http.Request var req *http.Request
if tt.req == nil { if tt.req == nil {
req, _ = http.NewRequest("GET", "", strings.NewReader("")) req, _ = http.NewRequest("POST", "", strings.NewReader(`{"user_name":"albertwesker","auth_hash":"1234abc"}`))
} else { } else {
req = tt.req() req = tt.req()
} }
@ -87,15 +107,17 @@ func TestUserRegister(t *testing.T) {
return return
} }
if tt.setup != nil {
err = tt.setup(opts) err = tt.setup(opts)
if err != nil { if err != nil {
t.Fatalf("setup failed: %s", err.Error()) t.Fatalf("setup failed: %s", err.Error())
return return
} }
}
api := &API{Opts: *opts} api := &API{Opts: *opts}
ctx := &ReqCtx{Req: req} ctx := &ReqCtx{Req: req}
_, err = api.InstanceInfo(ctx) _, err = api.UserRegister(ctx)
if tt.wantErr != nil && err != nil { if tt.wantErr != nil && err != nil {
if !reflect.DeepEqual(tt.wantErr, err) { if !reflect.DeepEqual(tt.wantErr, err) {
t.Errorf("got unwanted error: %s", err.Error()) t.Errorf("got unwanted error: %s", err.Error())
@ -103,16 +125,19 @@ func TestUserRegister(t *testing.T) {
return return
} }
if tt.assert != nil {
err = tt.assert(opts, t)
if err != nil {
t.Fatal(err.Error())
return
}
}
if tt.wantErr != nil && err == nil { if tt.wantErr != nil && err == nil {
t.Errorf("expected error") t.Errorf("expected error")
return return
} }
err = tt.assert(t)
if err != nil {
t.Fatal(err.Error())
return
}
}) })
} }
} }

View File

@ -95,13 +95,20 @@ func EnsureSchema(opts config.Options) error {
func GetUserByName(db *sql.DB, username string) (u *User, err error) { func GetUserByName(db *sql.DB, username string) (u *User, err error) {
var stmt *sql.Stmt var stmt *sql.Stmt
stmt, err = db.Prepare("select auth_hash from users where user_name = ?") stmt, err = db.Prepare("select user_id, user_name, auth_hash from users where user_name = ?")
if err != nil { if err != nil {
return return
} }
defer stmt.Close() defer stmt.Close()
if err = stmt.QueryRow(username).Scan(&u); err != nil { u = &User{}
if err = stmt.QueryRow(username).Scan(
&u.ID,
&u.Username,
&u.Hash,
// TODO support the rest
); err != nil {
if strings.Contains(err.Error(), "no rows in result") { if strings.Contains(err.Error(), "no rows in result") {
err = errors.New("no such user") err = errors.New("no such user")
} }