Fix failing test due to removing static constructor on the adats

albertjan · Jun 1, 2012 · fcaf230 · fcaf230
1 parent 0a64f25
commit fcaf230
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/Nancy.Tests/Unit/Conventions/DefaultStaticContentsConventionsFixture.cs b/src/Nancy.Tests/Unit/Conventions/DefaultStaticContentsConventionsFixture.cs
@@ -2,7 +2,7 @@
 {
     using System;
     using System.Collections.Generic;
-    using System.IO;
+    using Nancy.Bootstrapper;
     using Nancy.Conventions;
     using Xunit;
 
@@ -13,6 +13,7 @@ public class DefaultStaticContentsConventionsFixture
 
         public DefaultStaticContentsConventionsFixture()
         {
+            AppDomainAssemblyTypeScanner.LoadNancyAssemblies();
             this.conventions = new NancyConventions();
             this.staticContentsConventions = new DefaultStaticContentsConventions();
         }

diff --git a/src/Nancy.Tests/Unit/Conventions/DefaultViewLocationConventionsFixture.cs b/src/Nancy.Tests/Unit/Conventions/DefaultViewLocationConventionsFixture.cs
@@ -2,6 +2,7 @@ namespace Nancy.Tests.Unit.Conventions
 {
     using System;
     using System.Collections.Generic;
+    using Nancy.Bootstrapper;
     using Nancy.Conventions;
     using Nancy.ViewEngines;
     using Xunit;
@@ -13,6 +14,7 @@ public class DefaultViewLocationConventionsFixture
 
         public DefaultViewLocationConventionsFixture()
         {
+            AppDomainAssemblyTypeScanner.LoadNancyAssemblies ();
             this.conventions = new NancyConventions();
             this.viewLocationConventions = new DefaultViewLocationConventions();
         }

diff --git a/src/Nancy/Bootstrapper/AppDomainAssemblyTypeScanner.cs b/src/Nancy/Bootstrapper/AppDomainAssemblyTypeScanner.cs
@@ -13,10 +13,10 @@ namespace Nancy.Bootstrapper
     /// </summary>
     public static class AppDomainAssemblyTypeScanner
     {
-        static AppDomainAssemblyTypeScanner()
-        {
-            LoadNancyAssemblies();
-        }
+        //static AppDomainAssemblyTypeScanner()
+        //{
+        //    LoadNancyAssemblies();
+        //}
 
         /// <summary>
         /// Nancy core assembly