Fixed broke tests caused by Nancy upgrade

ciriarte · Jul 5, 2013 · 6856c47 · 6856c47
1 parent ea6b63c
commit 6856c47
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 69 deletions.
diff --git a/src/Servant.Manager/app.config b/src/Servant.Manager/app.config
diff --git a/src/Servant.Manager/packages.config b/src/Servant.Manager/packages.config
diff --git a/src/Servant.Manager/web.config b/src/Servant.Manager/web.config
diff --git a/src/Servant.Server/Bootstrapper.cs b/src/Servant.Server/Bootstrapper.cs
@@ -35,7 +35,7 @@ protected override void ConfigureApplicationContainer(TinyIoCContainer container
             base.ConfigureApplicationContainer(container);
 
             var assembly = typeof(Servant.Web.Bootstrapper).Assembly;
-            ResourceViewLocationProvider.Ignore.Add(Assembly.Load("Nancy.ViewEngines.Razor, Version=0.16.1.0, Culture=neutral, PublicKeyToken=null"));
+            ResourceViewLocationProvider.Ignore.Add(Assembly.Load("Nancy.ViewEngines.Razor, Version=0.17.1.0, Culture=neutral, PublicKeyToken=null"));
             ResourceViewLocationProvider.RootNamespaces.Clear();
             ResourceViewLocationProvider.RootNamespaces.Add(assembly, "Servant.Web.Views");
         }

diff --git a/src/Servant.Web.Tests/Helpers/Bootstrapper.cs b/src/Servant.Web.Tests/Helpers/Bootstrapper.cs
@@ -0,0 +1,17 @@
+using Nancy;
+using Nancy.Testing.Fakes;
+
+namespace Servant.Web.Tests.Helpers
+{
+    public class Bootstrapper : Server.Bootstrapper
+    {
+        // Using this because http://stackoverflow.com/questions/15138994/sequence-contains-more-than-one-element-an-nancybootstrapperbase-class
+        protected override IRootPathProvider RootPathProvider
+        {
+            get
+            {
+                return new FakeRootPathProvider();
+            }
+        }
+    }
+}
diff --git a/src/Servant.Web.Tests/Helpers/BrowserBuilder.cs b/src/Servant.Web.Tests/Helpers/BrowserBuilder.cs
@@ -10,7 +10,7 @@ public class BrowserBuilder
 
         public BrowserBuilder()
         {
-            _bootstrapper = new Servant.Server.Bootstrapper();
+            _bootstrapper = new Bootstrapper();
         }
 
         public BrowserBuilder WithoutConfiguration()

diff --git a/src/Servant.Web.Tests/Servant.Web.Tests.csproj b/src/Servant.Web.Tests/Servant.Web.Tests.csproj
@@ -35,14 +35,17 @@
     <Reference Include="CsQuery">
       <HintPath>..\packages\CsQuery.1.3.4\lib\net40\CsQuery.dll</HintPath>
     </Reference>
-    <Reference Include="Nancy">
-      <HintPath>..\packages\Nancy.0.16.1\lib\net40\Nancy.dll</HintPath>
+    <Reference Include="Nancy, Version=0.17.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Nancy.0.17.1\lib\net40\Nancy.dll</HintPath>
     </Reference>
-    <Reference Include="Nancy.Testing">
-      <HintPath>..\packages\Nancy.Testing.0.16.1\lib\net40\Nancy.Testing.dll</HintPath>
+    <Reference Include="Nancy.Testing, Version=0.17.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Nancy.Testing.0.17.1\lib\net40\Nancy.Testing.dll</HintPath>
     </Reference>
-    <Reference Include="Nancy.Validation.DataAnnotations">
-      <HintPath>..\packages\Nancy.Validation.DataAnnotations.0.16.1\lib\net40\Nancy.Validation.DataAnnotations.dll</HintPath>
+    <Reference Include="Nancy.Validation.DataAnnotations, Version=0.17.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Nancy.Validation.DataAnnotations.0.17.1\lib\net40\Nancy.Validation.DataAnnotations.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
@@ -54,6 +57,7 @@
     <Reference Include="System.Data" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Helpers\Bootstrapper.cs" />
     <Compile Include="Helpers\BrowserBuilder.cs" />
     <Compile Include="Helpers\BrowserContextExtensions.cs" />
     <Compile Include="HomeModuleTests.cs" />

diff --git a/src/Servant.Web.Tests/packages.config b/src/Servant.Web.Tests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="CsQuery" version="1.3.4" targetFramework="net45" />
-  <package id="Nancy" version="0.16.1" targetFramework="net45" />
-  <package id="Nancy.Testing" version="0.16.1" targetFramework="net45" />
-  <package id="Nancy.Validation.DataAnnotations" version="0.16.1" targetFramework="net45" />
+  <package id="Nancy" version="0.17.1" targetFramework="net45" />
+  <package id="Nancy.Testing" version="0.17.1" targetFramework="net45" />
+  <package id="Nancy.Validation.DataAnnotations" version="0.17.1" targetFramework="net45" />
   <package id="NUnit" version="2.6.2" targetFramework="net45" />
 </packages>
diff --git a/src/Servant.Web/Modules/SitesModule.cs b/src/Servant.Web/Modules/SitesModule.cs
@@ -353,12 +353,15 @@ public void ValidateSiteApplications(Site site)
                 if (string.IsNullOrWhiteSpace(application.Path))
                     AddPropertyError("path[" + i + "]", "Path is required.");
 
-                if(!FileSystemHelper.IsPathValid(application.DiskPath))
+                if (!FileSystemHelper.IsPathValid(application.Path))
                     AddPropertyError("path[" + i + "]", "Path cannot contain the following characters: ?, ;, :, @, &, =, +, $, ,, |, \", <, >, *.");
-
+                
                 var existingApplicationByPath = site.Applications.SingleOrDefault(x => x != site.Applications[i] && x.Path == site.Applications[i].Path);
                 if (site.SitePath != null && existingApplicationByPath != null)
                     AddPropertyError("path[" + i + "]", "There's already an application with this path.");
+
+                if (!FileSystemHelper.IsPathValid(application.DiskPath))
+                    AddPropertyError("diskpath[" + i + "]", "Path cannot contain the following characters: ?, ;, :, @, &, =, +, $, ,, |, \", <, >, *.");
             }
         }
     }