diff --git a/test/UnitTest/Bootstrap.Admin/Api/SQLServer/InterfaceTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/InterfaceTest.cs index b1591385..7bd40f88 100644 --- a/test/UnitTest/Bootstrap.Admin/Api/SQLServer/InterfaceTest.cs +++ b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/InterfaceTest.cs @@ -1,4 +1,5 @@ using Bootstrap.Security; +using Bootstrap.Security.Mvc; using System.Collections.Generic; using System.Net.Http; using Xunit; @@ -40,7 +41,7 @@ namespace Bootstrap.Admin.Api.SqlServer [Fact] public async void RetrieveAppMenus_Ok() { - var ret = await Client.PostAsJsonAsync>("RetrieveAppMenus", new AppMenuOption() { AppId = "", UserName = "Admin", Url = "~/Admin/Index" }); + var ret = await Client.PostAsJsonAsync>("RetrieveAppMenus", new AppMenuOption() { AppId = "Demo", UserName = "Admin", Url = "~/Admin/Index" }); Assert.NotEmpty(ret); } } diff --git a/test/UnitTest/Bootstrap.Admin/Api/SQLServer/MenusTest.cs b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/MenusTest.cs index b3a947a5..24dfec96 100644 --- a/test/UnitTest/Bootstrap.Admin/Api/SQLServer/MenusTest.cs +++ b/test/UnitTest/Bootstrap.Admin/Api/SQLServer/MenusTest.cs @@ -29,7 +29,7 @@ namespace Bootstrap.Admin.Api.SqlServer [InlineData("Application", "desc")] public async void Get_Ok(string query, string order) { - var qd = await Client.GetAsJsonAsync>($"?sort={query}&order={order}&offset=0&limit=100&parentName=%E6%B5%8B%E8%AF%95%E9%A1%B5%E9%9D%A2&name=%E5%85%B3%E4%BA%8E&category=1&isresource=0&appCode=2&_=1558235377255"); + var qd = await Client.GetAsJsonAsync>($"?sort={query}&order={order}&offset=0&limit=100&parentName=%E6%B5%8B%E8%AF%95%E9%A1%B5%E9%9D%A2&name=%E5%85%B3%E4%BA%8E&category=1&isresource=0&appId=Demo&_=1558235377255"); Assert.Single(qd.rows); } diff --git a/test/UnitTest/Bootstrap.Admin/Controllers/SQLServer/AccountTest.cs b/test/UnitTest/Bootstrap.Admin/Controllers/SQLServer/AccountTest.cs index b4c555a4..65748d5a 100644 --- a/test/UnitTest/Bootstrap.Admin/Controllers/SQLServer/AccountTest.cs +++ b/test/UnitTest/Bootstrap.Admin/Controllers/SQLServer/AccountTest.cs @@ -139,7 +139,7 @@ namespace Bootstrap.Admin.Controllers.SqlServer { new StringContent(antiToken), "__RequestVerificationToken" } }; var m = await client.PostAsync("/Account/Mobile", content); - Assert.True(m.IsSuccessStatusCode); + Assert.False(m.IsSuccessStatusCode); var payload = await r.Content.ReadAsStringAsync(); Assert.Contains("登 录", payload); } diff --git a/test/UnitTest/Bootstrap.DataAccess/SQLServer/DictsTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/DictsTest.cs index f1ad4d19..b0de1746 100644 --- a/test/UnitTest/Bootstrap.DataAccess/SQLServer/DictsTest.cs +++ b/test/UnitTest/Bootstrap.DataAccess/SQLServer/DictsTest.cs @@ -1,4 +1,5 @@ using Bootstrap.Security; +using Bootstrap.Security.Mvc; using Microsoft.Extensions.DependencyInjection; using System; using System.Linq; @@ -57,13 +58,13 @@ namespace Bootstrap.DataAccess.SqlServer [Fact] public void RetrieveWebTitle_Ok() { - Assert.Equal("后台管理系统", DictHelper.RetrieveWebTitle("BA")); + Assert.Equal("后台管理系统", DictHelper.RetrieveWebTitle(BootstrapAppContext.AppId)); } [Fact] public void RetrieveWebFooter_Ok() { - Assert.Equal("2016 © 通用后台管理系统", DictHelper.RetrieveWebFooter("BA")); + Assert.Equal("2016 © 通用后台管理系统", DictHelper.RetrieveWebFooter(BootstrapAppContext.AppId)); } [Fact] @@ -87,16 +88,16 @@ namespace Bootstrap.DataAccess.SqlServer [Fact] public void RetrieveHomeUrl_Ok() { - Assert.Equal("~/Home/Index", DictHelper.RetrieveHomeUrl(string.Empty)); - var url = DictHelper.RetrieveHomeUrl("2"); - Assert.NotEqual("~/Home/Index", url); + Assert.Equal("~/Home/Index", DictHelper.RetrieveHomeUrl("BA")); + var url = DictHelper.RetrieveHomeUrl("Demo"); + Assert.Equal("http://localhost:49185/", url); // INSERT INTO [Dicts] ([Category], [Name], [Code], [Define]) VALUES ('应用首页', 2, 'http://localhost:49185/', 0); - var dict = DictHelper.RetrieveDicts().FirstOrDefault(d => d.Category == "应用首页" && d.Name == "2"); + var dict = DictHelper.RetrieveDicts().FirstOrDefault(d => d.Category == "应用首页" && d.Name == "Demo"); url = dict.Code; - dict.Code = ""; + dict.Code = "BA"; Assert.True(DictHelper.Save(dict)); - Assert.Equal("~/Home/Index", DictHelper.RetrieveHomeUrl("2")); + Assert.Equal("BA", DictHelper.RetrieveHomeUrl("Demo")); dict.Code = url; Assert.True(DictHelper.Save(dict)); diff --git a/test/UnitTest/Bootstrap.DataAccess/SQLServer/RolesTest.cs b/test/UnitTest/Bootstrap.DataAccess/SQLServer/RolesTest.cs index 6e1695ac..d6bb4e52 100644 --- a/test/UnitTest/Bootstrap.DataAccess/SQLServer/RolesTest.cs +++ b/test/UnitTest/Bootstrap.DataAccess/SQLServer/RolesTest.cs @@ -1,4 +1,5 @@ -using System.Linq; +using Bootstrap.Security.Mvc; +using System.Linq; using Xunit; namespace Bootstrap.DataAccess.SqlServer @@ -86,7 +87,7 @@ namespace Bootstrap.DataAccess.SqlServer [Fact] public void RetrieveRolesByUrl_Ok() { - Assert.NotEmpty(RoleHelper.RetrievesByUrl("~/Home/Index", "BA")); + Assert.NotEmpty(RoleHelper.RetrievesByUrl("~/Home/Index", BootstrapAppContext.AppId)); } [Fact] diff --git a/test/UnitTest/appsettings.json b/test/UnitTest/appsettings.json index 3648254c..e11222a4 100644 --- a/test/UnitTest/appsettings.json +++ b/test/UnitTest/appsettings.json @@ -49,6 +49,7 @@ } } ], + "AppId": "BA", "GiteeHealthChecks": true, "GiteeOptions": { "Enabled": false