Upgrade v1.12.3 (#202)

* Fix the problem of package facades path * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Upgrade v1.12.3 * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action * Optimize action
goravel · hwbrzzl · Jul 28, 2023 · Jun 19, 2023 · Jun 19, 2023 · Jun 20, 2023
commit f7260a71f3194d85242b6fe3ee304640126e27d4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -19,3 +19,17 @@ jobs:
         run: go mod tidy
       - name: Run tests
         run: go test ./...
+  windows:
+    strategy:
+      matrix:
+        go: [ '1.20', '1.19', '1.18' ]
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go }}
+      - name: Install dependencies
+        run: go mod tidy
+      - name: Run tests
+        run: go test ./... -short
diff --git a/auth/console/policy_make_command_test.go b/auth/console/policy_make_command_test.go
@@ -28,5 +28,5 @@ func TestEventMakeCommand(t *testing.T) {
 	assert.True(t, file.Contain("app/policies/User/auth_policy.go", "package User"))
 	assert.True(t, file.Contain("app/policies/User/auth_policy.go", "type AuthPolicy struct {"))
 
-	assert.True(t, file.Remove("app"))
+	assert.Nil(t, file.Remove("app"))
 }
diff --git a/config/application_test.go b/config/application_test.go
@@ -21,7 +21,7 @@ func TestApplicationTestSuite(t *testing.T) {
 		config: NewApplication(".env"),
 	})
 
-	file.Remove(".env")
+	assert.Nil(t, file.Remove(".env"))
 }
 
 func (s *ApplicationTestSuite) SetupTest() {

diff --git a/console/console/key_generate_command_test.go b/console/console/key_generate_command_test.go
@@ -49,7 +49,7 @@ func TestKeyGenerateCommand(t *testing.T) {
 	env, err = os.ReadFile(".env")
 	assert.Nil(t, err)
 	assert.True(t, len(env) > 10)
-	assert.True(t, file.Remove(".env"))
+	assert.Nil(t, file.Remove(".env"))
 
 	mockConfig.AssertExpectations(t)
 }
diff --git a/console/console/make_command_test.go b/console/console/make_command_test.go
@@ -22,5 +22,5 @@ func TestMakeCommand(t *testing.T) {
 	assert.True(t, file.Contain("app/console/commands/Goravel/clean_cache.go", "package Goravel"))
 	assert.True(t, file.Contain("app/console/commands/Goravel/clean_cache.go", "type CleanCache struct"))
 
-	assert.True(t, file.Remove("app"))
+	assert.Nil(t, file.Remove("app"))
 }
diff --git a/database/console/migrate_command_test.go b/database/console/migrate_command_test.go
@@ -20,6 +20,10 @@ type Agent struct {
 }
 
 func TestMigrateCommand(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	var (
 		mockConfig *configmock.Config
 		pool       *dockertest.Pool
@@ -169,6 +173,6 @@ INSERT INTO agents (name, created_at, updated_at) VALUES ('goravel', '2023-03-11
 }
 
 func removeMigrations() {
-	file.Remove("database")
-	file.Remove("goravel")
+	_ = file.Remove("database")
+	_ = file.Remove("goravel")
 }
diff --git a/database/console/migrate_creator_test.go b/database/console/migrate_creator_test.go
@@ -23,7 +23,7 @@ func TestCreate(t *testing.T) {
 	assert.Nil(t, migrateCreator.Create("create_users_table", "users", true))
 	assert.True(t, file.Exists(fmt.Sprintf("database/migrations/%s_%s.%s.sql", now.ToShortDateTimeString(), "create_users_table", "up")))
 	assert.True(t, file.Exists(fmt.Sprintf("database/migrations/%s_%s.%s.sql", now.ToShortDateTimeString(), "create_users_table", "down")))
-	assert.True(t, file.Remove("database"))
+	assert.Nil(t, file.Remove("database"))
 	carbon.UnsetTestNow()
 
 	mockConfig.AssertExpectations(t)

diff --git a/database/console/migrate_fresh_command_test.go b/database/console/migrate_fresh_command_test.go
@@ -13,6 +13,10 @@ import (
 )
 
 func TestMigrateFreshCommand(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	var (
 		mockConfig *configmock.Config
 		pool       *dockertest.Pool

diff --git a/database/console/migrate_make_command_test.go b/database/console/migrate_make_command_test.go
@@ -33,7 +33,7 @@ func TestMigrateMakeCommand(t *testing.T) {
 	assert.Nil(t, migrateMakeCommand.Handle(mockContext))
 	assert.True(t, file.Exists(up))
 	assert.True(t, file.Exists(down))
-	assert.True(t, file.Remove("database"))
+	assert.Nil(t, file.Remove("database"))
 
 	mockConfig.AssertExpectations(t)
 }
diff --git a/database/console/migrate_refresh_command_test.go b/database/console/migrate_refresh_command_test.go
@@ -13,6 +13,10 @@ import (
 )
 
 func TestMigrateRefreshCommand(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	var (
 		mockConfig *configmock.Config
 		pool       *dockertest.Pool

diff --git a/database/console/migrate_reset_command_test.go b/database/console/migrate_reset_command_test.go
@@ -13,6 +13,10 @@ import (
 )
 
 func TestMigrateResetCommand(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	var (
 		mockConfig *configmock.Config
 		pool       *dockertest.Pool

diff --git a/database/console/migrate_rollback_command_test.go b/database/console/migrate_rollback_command_test.go
@@ -13,6 +13,10 @@ import (
 )
 
 func TestMigrateRollbackCommand(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	var (
 		mockConfig *configmock.Config
 		pool       *dockertest.Pool

diff --git a/database/console/migrate_status_command_test.go b/database/console/migrate_status_command_test.go
@@ -13,6 +13,10 @@ import (
 )
 
 func TestMigrateStatusCommand(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	var (
 		mockConfig *configmock.Config
 		pool       *dockertest.Pool

diff --git a/database/console/model_make_command_test.go b/database/console/model_make_command_test.go
@@ -26,7 +26,7 @@ func TestModelMakeCommand(t *testing.T) {
 	assert.True(t, file.Contain("app/models/User/phone.go", "package User"))
 	assert.True(t, file.Contain("app/models/User/phone.go", "type Phone struct"))
 
-	assert.True(t, file.Remove("app"))
+	assert.Nil(t, file.Remove("app"))
 
 	mockContext.AssertExpectations(t)
 }
diff --git a/database/console/observer_make_command_test.go b/database/console/observer_make_command_test.go
@@ -26,7 +26,7 @@ func TestObserverMakeCommand(t *testing.T) {
 	assert.True(t, file.Contain("app/observers/User/phone_observer.go", "package User"))
 	assert.True(t, file.Contain("app/observers/User/phone_observer.go", "type PhoneObserver struct"))
 
-	assert.True(t, file.Remove("app"))
+	assert.Nil(t, file.Remove("app"))
 
 	mockContext.AssertExpectations(t)
 }
diff --git a/database/gorm/query_test.go b/database/gorm/query_test.go
@@ -300,6 +300,10 @@ type QueryTestSuite struct {
 }
 
 func TestQueryTestSuite(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	testContext = context.Background()
 	testContext = context.WithValue(testContext, testContextKey, "goravel")
 
@@ -336,7 +340,7 @@ func TestQueryTestSuite(t *testing.T) {
 		},
 	})
 
-	file.Remove(dbDatabase)
+	assert.Nil(t, file.Remove(dbDatabase))
 	assert.Nil(t, mysqlPool.Purge(mysqlResource))
 	assert.Nil(t, postgresqlPool.Purge(postgresqlResource))
 	assert.Nil(t, sqlserverPool.Purge(sqlserverResource))
@@ -2755,6 +2759,10 @@ func (s *QueryTestSuite) TestDBRaw() {
 }
 
 func TestReadWriteSeparate(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	readMysqlDocker := NewMysqlDocker()
 	readMysqlPool, readMysqlResource, readMysqlQuery, err := readMysqlDocker.New()
 	if err != nil {
@@ -2869,8 +2877,8 @@ func TestReadWriteSeparate(t *testing.T) {
 		})
 	}
 
-	file.Remove(dbDatabase)
-	file.Remove(dbDatabase1)
+	assert.Nil(t, file.Remove(dbDatabase))
+	assert.Nil(t, file.Remove(dbDatabase1))
 
 	if err := readMysqlPool.Purge(readMysqlResource); err != nil {
 		log.Fatalf("Could not purge resource: %s", err)
@@ -2893,6 +2901,10 @@ func TestReadWriteSeparate(t *testing.T) {
 }
 
 func TestTablePrefixAndSingular(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	mysqlDocker := NewMysqlDocker()
 	mysqlPool, mysqlResource, err := mysqlDocker.Init()
 	if err != nil {
@@ -2956,7 +2968,7 @@ func TestTablePrefixAndSingular(t *testing.T) {
 		})
 	}
 
-	file.Remove(dbDatabase)
+	assert.Nil(t, file.Remove(dbDatabase))
 
 	if err := mysqlPool.Purge(mysqlResource); err != nil {
 		log.Fatalf("Could not purge resource: %s", err)

diff --git a/database/gorm/test_utils_test.go b/database/gorm/test_utils_test.go
@@ -9,6 +9,10 @@ import (
 )
 
 func TestMysqlDocker(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	docker := NewMysqlDocker()
 	pool, resource, query, err := docker.New()
 
@@ -19,6 +23,10 @@ func TestMysqlDocker(t *testing.T) {
 }
 
 func TestPostgresqlDocker(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	docker := NewPostgresqlDocker()
 	pool, resource, query, err := docker.New()
 
@@ -29,18 +37,25 @@ func TestPostgresqlDocker(t *testing.T) {
 }
 
 func TestSqliteDocker(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	docker := NewSqliteDocker(dbDatabase)
 	pool, resource, db, err := docker.New()
 
 	assert.NotNil(t, pool)
 	assert.NotNil(t, resource)
 	assert.NotNil(t, db)
 	assert.Nil(t, err)
-
-	file.Remove("goravel")
+	assert.Nil(t, file.Remove("goravel"))
 }
 
 func TestSqlserverDocker(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	docker := NewSqlserverDocker()
 	pool, resource, db, err := docker.New()
 

diff --git a/database/orm_test.go b/database/orm_test.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/suite"
 
 	contractsorm "github.com/goravel/framework/contracts/database/orm"
@@ -41,6 +42,10 @@ var (
 )
 
 func TestOrmSuite(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping tests of using docker")
+	}
+
 	mysqlDocker := gorm.NewMysqlDocker()
 	mysqlPool, mysqlResource, mysqlQuery, err := mysqlDocker.New()
 	if err != nil {
@@ -71,7 +76,7 @@ func TestOrmSuite(t *testing.T) {
 
 	suite.Run(t, new(OrmSuite))
 
-	file.Remove("goravel")
+	assert.Nil(t, file.Remove("goravel"))
 
 	if err := mysqlPool.Purge(mysqlResource); err != nil {
 		log.Fatalf("Could not purge resource: %s", err)
@@ -82,6 +87,7 @@ func TestOrmSuite(t *testing.T) {
 	if err := sqlserverPool.Purge(sqlserverResource); err != nil {
 		log.Fatalf("Could not purge resource: %s", err)
 	}
+
 }
 
 func (s *OrmSuite) SetupTest() {

diff --git a/event/console/event_make_command_test.go b/event/console/event_make_command_test.go
@@ -27,6 +27,5 @@ func TestEventMakeCommand(t *testing.T) {
 	assert.True(t, file.Exists("app/events/Goravel/event.go"))
 	assert.True(t, file.Contain("app/events/Goravel/event.go", "package Goravel"))
 	assert.True(t, file.Contain("app/events/Goravel/event.go", "type Event struct {"))
-
-	assert.True(t, file.Remove("app"))
+	assert.Nil(t, file.Remove("app"))
 }
diff --git a/event/console/listener_make_command_test.go b/event/console/listener_make_command_test.go
@@ -27,6 +27,5 @@ func TestListenerMakeCommand(t *testing.T) {
 	assert.True(t, file.Exists("app/listeners/Goravel/listen.go"))
 	assert.True(t, file.Contain("app/listeners/Goravel/listen.go", "package Goravel"))
 	assert.True(t, file.Contain("app/listeners/Goravel/listen.go", "type Listen struct {"))
-
-	assert.True(t, file.Remove("app"))
+	assert.Nil(t, file.Remove("app"))
 }
diff --git a/filesystem/application_test.go b/filesystem/application_test.go
@@ -397,11 +397,11 @@ func TestStorage(t *testing.T) {
 		}
 
 		if disk.disk == "local" || disk.disk == "custom" {
-			file.Remove("./storage")
+			assert.Nil(t, file.Remove("./storage"))
 		}
 	}
 
-	file.Remove("test.txt")
+	assert.Nil(t, file.Remove("test.txt"))
 }
 
 func initConfig() *configmocks.Config {

diff --git a/filesystem/file_test.go b/filesystem/file_test.go
@@ -25,7 +25,7 @@ type FileTestSuite struct {
 func TestFileTestSuite(t *testing.T) {
 	suite.Run(t, new(FileTestSuite))
 
-	file.Remove("test.txt")
+	assert.Nil(t, file.Remove("test.txt"))
 }
 
 func (s *FileTestSuite) SetupTest() {

diff --git a/foundation/application.go b/foundation/application.go
@@ -170,7 +170,7 @@ func (app *Application) setTimezone() {
 
 func setEnv() {
 	args := os.Args
-	if strings.HasSuffix(os.Args[0], ".test") {
+	if strings.HasSuffix(os.Args[0], ".test") || strings.HasSuffix(os.Args[0], ".test.exe") {
 		support.Env = support.EnvTest
 	}
 	if len(args) >= 2 {