resolved #20: Don't run multi tenant tests when multi tenancy is disabled.

ismcagdas · ismcagdas · commit 590943f0d423 · 2017-03-24T16:05:02.000+03:00
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameConsts.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameConsts.cs
@@ -5,5 +5,7 @@ public class AbpProjectNameConsts
         public const string LocalizationSourceName = "AbpProjectName";
 
         public const string ConnectionStringName = "Default";
+
+        public const bool MultiTenancyEnabled = true;
     }
 }
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameCoreModule.cs b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpProjectNameCoreModule.cs
@@ -26,7 +26,7 @@ public override void PreInitialize()
             AbpProjectNameLocalizationConfigurer.Configure(Configuration.Localization);
 
             //Enable this line to create a multi-tenant application.
-            Configuration.MultiTenancy.IsEnabled = true;
+            Configuration.MultiTenancy.IsEnabled = AbpProjectNameConsts.MultiTenancyEnabled;
 
             //Configure roles
             AppRoleConfig.Configure(Configuration.Modules.Zero().RoleManagement);
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Shared/Components/TenantChange/Default.min.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Shared/Components/TenantChange/Default.min.js
diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Shared/Components/TenantChange/_ChangeModal.min.js b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/Shared/Components/TenantChange/_ChangeModal.min.js
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj
@@ -32,4 +32,10 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpProjectNameTestBase.cs b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpProjectNameTestBase.cs
@@ -208,8 +208,6 @@ protected void LoginAsDefaultTenantAdmin()
 
         protected void LoginAsHost(string userName)
         {
-            Resolve<IMultiTenancyConfig>().IsEnabled = true;
-
             AbpSession.TenantId = null;
 
             var user =
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/MultiTenantFactAttribute.cs b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/MultiTenantFactAttribute.cs
@@ -0,0 +1,15 @@
+﻿using Xunit;
+
+namespace AbpCompanyName.AbpProjectName.Tests
+{
+    public sealed class MultiTenantFactAttribute : FactAttribute
+    {
+        public MultiTenantFactAttribute()
+        {
+            if (!AbpProjectNameConsts.MultiTenancyEnabled)
+            {
+                Skip = "MultiTenancy is disabled.";
+            }
+        }
+    }
+}
diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/Sessions/SessionAppService_Tests.cs b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/Sessions/SessionAppService_Tests.cs
@@ -14,7 +14,7 @@ public SessionAppService_Tests()
             _sessionAppService = Resolve<ISessionAppService>();
         }
 
-        [Fact]
+        [MultiTenantFact]
         public async Task Should_Get_Current_User_When_Logged_In_As_Host()
         {
             //Arrange

Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,7 @@ public class AbpProjectNameConsts`
`5`	`5`	`public const string LocalizationSourceName = "AbpProjectName";`
`6`	`6`
`7`	`7`	`public const string ConnectionStringName = "Default";`
	`8`	`+`
	`9`	`+ public const bool MultiTenancyEnabled = true;`
`8`	`10`	`}`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -208,8 +208,6 @@ protected void LoginAsDefaultTenantAdmin()`
`208`	`208`
`209`	`209`	`protected void LoginAsHost(string userName)`
`210`	`210`	`{`
`211`		`- Resolve<IMultiTenancyConfig>().IsEnabled = true;`
`212`		`-`
`213`	`211`	`AbpSession.TenantId = null;`
`214`	`212`
`215`	`213`	`var user =`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public SessionAppService_Tests()`
`14`	`14`	`_sessionAppService = Resolve<ISessionAppService>();`
`15`	`15`	`}`
`16`	`16`
`17`		`- [Fact]`
	`17`	`+ [MultiTenantFact]`
`18`	`18`	`public async Task Should_Get_Current_User_When_Logged_In_As_Host()`
`19`	`19`	`{`
`20`	`20`	`//Arrange`