Merge branch 'master' into docker-multiarch

gotify · Oct 16, 2024 · 97a8020 · 97a8020
2 parents 721aecf + 58084c8
commit 97a8020
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/router/router.go b/router/router.go
@@ -104,7 +104,7 @@ func Create(db *database.GormDatabase, vInfo *model.VersionInfo, conf *config.Co
 
 	ui.Register(g, *vInfo, conf.Registration)
 
-	g.GET("/health", healthHandler.Health)
+	g.Match([]string{"GET", "HEAD"}, "/health", healthHandler.Health)
 	g.GET("/swagger", docs.Serve)
 	g.StaticFS("/image", &onlyImageFS{inner: gin.Dir(conf.UploadedImagesDir, false)})
 

diff --git a/test/testdb/database.go b/test/testdb/database.go
@@ -30,15 +30,15 @@ type MessageBuilder struct {
 
 // NewDBWithDefaultUser creates a new test db instance with the default user.
 func NewDBWithDefaultUser(t *testing.T) *Database {
-	db, err := database.New("sqlite3", fmt.Sprintf("file:%s?mode=memory&cache=shared", fmt.Sprint(time.Now().Unix())), "admin", "pw", 5, true)
+	db, err := database.New("sqlite3", fmt.Sprintf("file:%s?mode=memory&cache=shared", fmt.Sprint(time.Now().UnixNano())), "admin", "pw", 5, true)
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 	return &Database{GormDatabase: db, t: t}
 }
 
 // NewDB creates a new test db instance.
 func NewDB(t *testing.T) *Database {
-	db, err := database.New("sqlite3", fmt.Sprintf("file:%s?mode=memory&cache=shared", fmt.Sprint(time.Now().Unix())), "admin", "pw", 5, false)
+	db, err := database.New("sqlite3", fmt.Sprintf("file:%s?mode=memory&cache=shared", fmt.Sprint(time.Now().UnixNano())), "admin", "pw", 5, false)
 	assert.Nil(t, err)
 	assert.NotNil(t, db)
 	return &Database{GormDatabase: db, t: t}

diff --git a/ui/src/tests/setup.ts b/ui/src/tests/setup.ts
@@ -65,7 +65,7 @@ const testPluginDir = (): {dir: string; generator: () => string} => {
     const dirName = 'gotifyplugin_' + random;
     const dir = path.join(testBuildPath, dirName);
     if (!fs.existsSync(dir)) {
-        fs.mkdirSync(dir, 0o755);
+        fs.mkdirSync(dir, {recursive: true, mode: 0o755});
     }
     return {
         dir,
@@ -105,7 +105,7 @@ const buildGoExecutable = (filename: string): Promise<void> => {
     const envGotify = process.env.GOTIFY_EXE;
     if (envGotify) {
         if (!fs.existsSync(testBuildPath)) {
-            fs.mkdirSync(testBuildPath);
+            fs.mkdirSync(testBuildPath, {recursive: true});
         }
         fs.copyFileSync(envGotify, filename);
         process.stdout.write(`### Copying ${envGotify} to ${filename}\n`);