Commit7d3555e

committed

fix some tests

1 parentb7fd329 commit7d3555eCopy full SHA for 7d3555e

File tree

-16

lines changed

-16

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ import (`
`11`	`11`
`12`	`12`	`"github.com/coder/coder/v2/cli/clitest"`
`13`	`13`	`"github.com/coder/coder/v2/coderd/coderdtest"`
`14`		`-"github.com/coder/coder/v2/coderd/database"`
`15`	`14`	`"github.com/coder/coder/v2/coderd/database/dbauthz"`
`16`	`15`	`"github.com/coder/coder/v2/codersdk"`
`17`	`16`	`"github.com/coder/coder/v2/pty/ptytest"`
`@@ -95,10 +94,7 @@ func TestDelete(t *testing.T) {`
`95`	`94`	`// this way.`
`96`	`95`	`ctx:=testutil.Context(t,testutil.WaitShort)`
`97`	`96`	`// nolint:gocritic // Unit test`
`98`		`-err:=api.Database.UpdateUserDeletedByID(dbauthz.AsSystemRestricted(ctx), database.UpdateUserDeletedByIDParams{`
`99`		`-ID:deleteMeUser.ID,`
`100`		`-Deleted:true,`
`101`		`-})`
	`97`	`+err:=api.Database.SoftDeleteUserByID(dbauthz.AsSystemRestricted(ctx),deleteMeUser.ID)`
`102`	`98`	`require.NoError(t,err)`
`103`	`99`
`104`	`100`	`inv,root:=clitest.New(t,"delete",fmt.Sprintf("%s/%s",deleteMeUser.ID,workspace.Name),"-y","--orphan")`

Lines changed: 0 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1018,13 +1018,6 @@ func (s *MethodTestSuite) TestUser() {`
`1018`	`1018`	`u:=dbgen.User(s.T(),db, database.User{})`
`1019`	`1019`	`check.Args(u.ID).Asserts(u,rbac.ActionDelete).Returns()`
`1020`	`1020`	`}))`
`1021`		`-s.Run("UpdateUserDeletedByID",s.Subtest(func(db database.Store,check*expects) {`
`1022`		`-u:=dbgen.User(s.T(),db, database.User{Deleted:true})`
`1023`		`-check.Args(database.UpdateUserDeletedByIDParams{`
`1024`		`-ID:u.ID,`
`1025`		`-Deleted:true,`
`1026`		`-}).Asserts(u,rbac.ActionDelete).Returns()`
`1027`		`-}))`
`1028`	`1021`	`s.Run("UpdateUserHashedPassword",s.Subtest(func(db database.Store,check*expects) {`
`1029`	`1022`	`u:=dbgen.User(s.T(),db, database.User{})`
`1030`	`1023`	`check.Args(database.UpdateUserHashedPasswordParams{`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -310,10 +310,7 @@ func User(t testing.TB, db database.Store, orig database.User) database.User {`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`iforig.Deleted {`
`313`		`-err=db.UpdateUserDeletedByID(genCtx, database.UpdateUserDeletedByIDParams{`
`314`		`-ID:user.ID,`
`315`		`-Deleted:orig.Deleted,`
`316`		`-})`
	`313`	`+err=db.SoftDeleteUserByID(genCtx,user.ID)`
`317`	`314`	`require.NoError(t,err,"set user as deleted")`
`318`	`315`	`}`
`319`	`316`	`returnuser`

Comments

(0)