Skip to content

Commit 39be315

Browse files
committed
resolved #38: Don't run multi tenant tests when multi tenancy is disabled.
1 parent cf79d3f commit 39be315

File tree

5 files changed

+25
-4
lines changed

5 files changed

+25
-4
lines changed

src/Tests/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@
183183
</ItemGroup>
184184
<ItemGroup>
185185
<Compile Include="AbpProjectNameTestModule.cs" />
186+
<Compile Include="MultiTenantFactAttribute.cs" />
186187
<Compile Include="Properties\AssemblyInfo.cs" />
187188
<Compile Include="Sessions\SessionAppService_Tests.cs" />
188189
<Compile Include="AbpProjectNameTestBase.cs" />

src/Tests/AbpCompanyName.AbpProjectName.Tests/AbpProjectNameTestBase.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,6 @@ protected void LogoutAsDefaultTenant()
212212

213213
protected void LoginAsHost(string userName)
214214
{
215-
Resolve<IMultiTenancyConfig>().IsEnabled = true;
216-
217215
AbpSession.TenantId = null;
218216

219217
var user =

src/Tests/AbpCompanyName.AbpProjectName.Tests/App.config

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<configSections>
44
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
55
</configSections>
6+
<appSettings>
7+
<add key="MultiTenancyEnabled" value="true"/>
8+
</appSettings>
69
<runtime>
710
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
811
<dependentAssembly>
@@ -23,4 +26,7 @@
2326
</dependentAssembly>
2427
</assemblyBinding>
2528
</runtime>
26-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" /></startup></configuration>
29+
<startup>
30+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
31+
</startup>
32+
</configuration>
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
using Xunit;
2+
3+
namespace AbpCompanyName.AbpProjectName.Tests
4+
{
5+
public sealed class MultiTenantFactAttribute : FactAttribute
6+
{
7+
public MultiTenantFactAttribute()
8+
{
9+
var multiTenancyConfig = System.Configuration.ConfigurationManager.AppSettings["MultiTenancyEnabled"];
10+
if (multiTenancyConfig != null && multiTenancyConfig == "false")
11+
{
12+
Skip = "MultiTenancy is disabled.";
13+
}
14+
}
15+
}
16+
}

src/Tests/AbpCompanyName.AbpProjectName.Tests/Sessions/SessionAppService_Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public SessionAppService_Tests()
1414
_sessionAppService = Resolve<ISessionAppService>();
1515
}
1616

17-
[Fact]
17+
[MultiTenantFact]
1818
public async Task Should_Get_Current_User_When_Logged_In_As_Host()
1919
{
2020
//Arrange

0 commit comments

Comments
 (0)