From bab6ca51b55f756faeb5fad1e91986b994c1cc39 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 21 Sep 2022 19:24:40 +0800 Subject: [PATCH] [fix] widgets tests --- widgets/app/app_test.go | 6 +++--- widgets/login/login_test.go | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/widgets/app/app_test.go b/widgets/app/app_test.go index 3491b6e2..19d22137 100644 --- a/widgets/app/app_test.go +++ b/widgets/app/app_test.go @@ -13,7 +13,7 @@ import ( ) func TestLoad(t *testing.T) { - + os.Unsetenv("YAO_LANG") lang.Load(config.Conf) err := Load(config.Conf) if err != nil { @@ -126,11 +126,11 @@ func TestProcessXgen(t *testing.T) { xgen := any.Of(res).MapStr().Dot() assert.Equal(t, "__yao", xgen.Get("apiPrefix")) assert.Equal(t, "Another yao application", xgen.Get("description")) - assert.Equal(t, "/api/__yao/login/admin/captcha", xgen.Get("login.admin.captcha")) + assert.Equal(t, "/api/__yao/login/admin/captcha?type=digit", xgen.Get("login.admin.captcha")) assert.Equal(t, "/api/__yao/login/admin", xgen.Get("login.admin.login")) assert.Equal(t, "/x/Table/pet", xgen.Get("login.entry.admin")) assert.Equal(t, "/x/Table/dash", xgen.Get("login.entry.user")) - assert.Equal(t, "/api/__yao/login/user/captcha", xgen.Get("login.user.captcha")) + assert.Equal(t, "/api/__yao/login/user/captcha?type=digit", xgen.Get("login.user.captcha")) assert.Equal(t, "/api/__yao/login/user", xgen.Get("login.user.login")) assert.Equal(t, os.Getenv("YAO_ENV"), xgen.Get("mode")) assert.Equal(t, "Demo Application", xgen.Get("name")) diff --git a/widgets/login/login_test.go b/widgets/login/login_test.go index 15a78a29..2d003163 100644 --- a/widgets/login/login_test.go +++ b/widgets/login/login_test.go @@ -13,6 +13,7 @@ import ( func TestLoad(t *testing.T) { + os.Unsetenv("YAO_LANG") lang.Load(config.Conf) err := Load(config.Conf) if err != nil { @@ -23,7 +24,7 @@ func TestLoad(t *testing.T) { assert.Equal(t, "admin", Logins["admin"].ID) assert.Equal(t, "Admin Login", Logins["admin"].Name) - assert.Equal(t, "yao.admin.login", Logins["admin"].Action.Process) + assert.Equal(t, "yao.admin.Login", Logins["admin"].Action.Process) assert.Equal(t, []string{":payload"}, Logins["admin"].Action.Args) assert.Equal(t, "yao.utils.Captcha", Logins["admin"].Layout.Captcha) assert.Equal(t, "/images/admin-cover.png", Logins["admin"].Layout.Cover) @@ -55,7 +56,7 @@ func TestLoadHK(t *testing.T) { assert.Equal(t, "admin", Logins["admin"].ID) assert.Equal(t, "管理員登錄", Logins["admin"].Name) - assert.Equal(t, "yao.admin.login", Logins["admin"].Action.Process) + assert.Equal(t, "yao.admin.Login", Logins["admin"].Action.Process) assert.Equal(t, []string{":payload"}, Logins["admin"].Action.Args) assert.Equal(t, "yao.utils.Captcha", Logins["admin"].Layout.Captcha) assert.Equal(t, "/images/admin-cover.png", Logins["admin"].Layout.Cover) @@ -87,7 +88,7 @@ func TestLoadCN(t *testing.T) { assert.Equal(t, "admin", Logins["admin"].ID) assert.Equal(t, "管理员登录", Logins["admin"].Name) - assert.Equal(t, "yao.admin.login", Logins["admin"].Action.Process) + assert.Equal(t, "yao.admin.Login", Logins["admin"].Action.Process) assert.Equal(t, []string{":payload"}, Logins["admin"].Action.Args) assert.Equal(t, "yao.utils.Captcha", Logins["admin"].Layout.Captcha) assert.Equal(t, "/images/admin-cover.png", Logins["admin"].Layout.Cover)