From 445022ef711274cb4ea1973a5b10ee7afc047a53 Mon Sep 17 00:00:00 2001 From: Jakub Zych Date: Tue, 6 Oct 2026 18:25:32 +0200 Subject: [PATCH] fix(15-01): keep models tests off the updates leaf summer build rejects models importing a sibling updates package, and a go.mod translate replace collides with the host workspace module path. Co-authored-by: Cursor --- go.mod | 2 -- models/post_translatable_smoke_test.go | 16 ++++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 7441d07..a09c907 100644 --- a/go.mod +++ b/go.mod @@ -119,5 +119,3 @@ require ( ) replace git.golem15.com/golem15/summercms => ../summercms.go - -replace git.golem15.com/golem15/sm-translate-plugin => ../sm-translate-plugin diff --git a/models/post_translatable_smoke_test.go b/models/post_translatable_smoke_test.go index bb34c13..6367ac9 100644 --- a/models/post_translatable_smoke_test.go +++ b/models/post_translatable_smoke_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" + "git.golem15.com/golem15/sm-journal-plugin" "git.golem15.com/golem15/sm-journal-plugin/models" - journalupdates "git.golem15.com/golem15/sm-journal-plugin/updates" + "git.golem15.com/golem15/sm-translate-plugin" "git.golem15.com/golem15/sm-translate-plugin/classes" translatemodels "git.golem15.com/golem15/sm-translate-plugin/models" - translateupdates "git.golem15.com/golem15/sm-translate-plugin/updates" "git.golem15.com/golem15/summercms/modules/lagoon" "github.com/go-gormigrate/gormigrate/v2" _ "github.com/jackc/pgx/v5/stdlib" @@ -111,18 +111,18 @@ func journalDB(t *testing.T) *gorm.DB { func migrateTranslateThenJournal(t *testing.T, gdb *gorm.DB) { t.Helper() - translate := gormigrate.New(gdb, &gormigrate.Options{ + translateMig := gormigrate.New(gdb, &gormigrate.Options{ TableName: "summer_migrations_golem15_translate", UseTransaction: true, - }, translateupdates.All()) - if err := translate.Migrate(); err != nil { + }, (&translate.Plugin{}).Migrations()) + if err := translateMig.Migrate(); err != nil { t.Fatalf("translate migrations: %v", err) } - journal := gormigrate.New(gdb, &gormigrate.Options{ + journalMig := gormigrate.New(gdb, &gormigrate.Options{ TableName: "summer_migrations_golem15_journal", UseTransaction: true, - }, journalupdates.All()) - if err := journal.Migrate(); err != nil { + }, (&journal.Plugin{}).Migrations()) + if err := journalMig.Migrate(); err != nil { t.Fatalf("journal migrations: %v", err) } }