Merge pull request #54 from mjohanss/master

gitignore on applicationhost.config + some cleanup

Author: jgauffin

.gitignore

@@ -33,3 +33,4 @@ _ReSharper*/
 src/Tools/MarkdownToNamespaceDoc/packages/*/
 src/Tools/TsGenerator/.vs/*
 src/Help/*
+src/Server/Coderr.Server.Web.Tests/applicationhost.config

src/Server/Coderr.Server.SqlServer.Tests/Helpers/DatabaseManager.cs

@@ -4,7 +4,6 @@
 using System.Data.SqlClient;
 using System.Diagnostics;
 using System.Threading;
-using codeRR.Server.SqlServer.Tools;
 using Griffin.Data;
 using Griffin.Data.Mapper;
 
@@ -35,17 +34,17 @@ public DatabaseManager(string databaseName = null, Func<string> connectionString
 
             var instanceId = Interlocked.Increment(ref InstanceCounter);
             _databaseName = databaseName ?? $"coderrTest{DateTime.Now:MMddHHmmss}_{instanceId}";
-            Console.WriteLine("DBNMAE: " + _databaseName);
+            Console.WriteLine("DBNAME: " + _databaseName);
             ConnectionString = connectionStringTemplateProvider()
                 .Replace("{databaseName}", _databaseName);
             _masterConString = connectionStringTemplateProvider()
                 .Replace("{databaseName}", "master");
-            UpdateToLatestVestion = true;
+            UpdateToLatestVersion = true;
         }
 
         public string ConnectionString { get; }
 
-        public bool UpdateToLatestVestion { get; set; }
+        public bool UpdateToLatestVersion { get; set; }
 
         public void Dispose()
         {
@@ -93,7 +92,7 @@ public void InitSchema()
             {
                 var schemaManager = new SchemaManager(OpenConnection);
                 schemaManager.CreateInitialStructure();
-                if (UpdateToLatestVestion)
+                if (UpdateToLatestVersion)
                     schemaManager.UpgradeDatabaseSchema();
             }
             catch (SqlException ex)

src/Server/Coderr.Server.SqlServer.Tests/SchemaManagerTests.cs

@@ -1,8 +1,6 @@
-using System;
-using System.Threading;
+using System.Threading;
 using codeRR.Server.SqlServer.Tests.Helpers;
 using FluentAssertions;
-using Griffin.Data.Mapper;
 using Xunit;
 
 namespace codeRR.Server.SqlServer.Tests
@@ -17,7 +15,7 @@ public void Should_report_upgradable_if_schema_version_is_less()
             Thread.Sleep(1000);
             using (var dbMgr = new DatabaseManager())
             {
-                dbMgr.UpdateToLatestVestion = false;
+                dbMgr.UpdateToLatestVersion = false;
                 dbMgr.CreateEmptyDatabase();
                 dbMgr.InitSchema();
                 dbMgr.UpdateSchema(1);
@@ -27,7 +25,6 @@ public void Should_report_upgradable_if_schema_version_is_less()
 
                 actual.Should().BeTrue();
             }
-
         }
 
         [Fact]
@@ -36,7 +33,7 @@ public void Should_not_report_upgradable_if_schema_version_is_same()
             Thread.Sleep(1000);
             using (var dbMgr = new DatabaseManager())
             {
-                dbMgr.UpdateToLatestVestion = false;
+                dbMgr.UpdateToLatestVersion = false;
                 dbMgr.CreateEmptyDatabase();
                 dbMgr.InitSchema();
                 dbMgr.UpdateSchema(-1);
@@ -54,7 +51,7 @@ public void Should_report_upgradable_if_schema_table_is_missing()
             Thread.Sleep(1000);
             using (var dbMgr = new DatabaseManager())
             {
-                dbMgr.UpdateToLatestVestion = false;
+                dbMgr.UpdateToLatestVersion = false;
                 dbMgr.CreateEmptyDatabase();
 
                 var sut = new SchemaManager(() => dbMgr.OpenConnection());
@@ -70,15 +67,13 @@ public void Should_be_able_to_upgrade_schema()
             Thread.Sleep(1000);
             using (var dbMgr = new DatabaseManager())
             {
-                dbMgr.UpdateToLatestVestion = false;
+                dbMgr.UpdateToLatestVersion = false;
                 dbMgr.CreateEmptyDatabase();
                 dbMgr.InitSchema();
 
                 var sut = new SchemaManager(() => dbMgr.OpenConnection());
                 sut.UpgradeDatabaseSchema();
-
             }
         }
-
     }
 }

src/Server/Coderr.Server.Web.Tests/Helpers/IisExpressHelper.cs

@@ -15,7 +15,7 @@ public class IisExpressHelper
         /// </summary>
         public string AppPool { get; set; }
 
-        public string BaseUrl => "http://localhost:50473/";
+        public string BaseUrl => "http://localhost:50473/coderr/";
 
         /// <summary>
         ///     Path to the IIS Express configuration file. Defaults to

src/Server/Coderr.Server.Web.Tests/Tests/HomePageTests.cs

@@ -3,7 +3,6 @@
 
 namespace codeRR.Server.Web.Tests.Tests
 {
-    
     [Trait("Category", "Integration")]
     public class HomePageTests : LoggedInTest
     {

src/Server/Coderr.Server.Web.Tests/Tests/IncidentsPageTests.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Threading;
 using codeRR.Client;
-using codeRR.Server.Web.Tests.Helpers;
 using codeRR.Server.Web.Tests.Pages;
 using Xunit;
 

src/Server/Coderr.Server.Web.Tests/Tests/LoginPageTests.cs

@@ -3,7 +3,6 @@
 
 namespace codeRR.Server.Web.Tests.Tests
 {
-    
     [Trait("Category", "Integration")]
     public class LoginPageTests : LoggedInTest
     {

src/Server/Coderr.Server.Web.Tests/WebTest.cs

@@ -5,12 +5,13 @@
 using codeRR.Server.SqlServer.Tests.Helpers;
 using codeRR.Server.Web.Tests.Helpers;
 using codeRR.Server.Web.Tests.Helpers.Selenium;
-using codeRR.Server.Web.Tests.Helpers.xUnit;
 using Griffin.Data.Mapper;
 using OpenQA.Selenium;
 using OpenQA.Selenium.Support.Extensions;
 using Xunit;
 
+[assembly: CollectionBehavior(CollectionBehavior.CollectionPerAssembly)]
+
 namespace codeRR.Server.Web.Tests
 {
     [TestCaseOrderer("codeRR.Server.Web.Tests.Helpers.xUnit.TestCaseOrderer", "codeRR.Server.Web.Tests")]
@@ -34,10 +35,15 @@ static WebTest()
                 _databaseManager.Dispose();
             };
 
-            _iisExpress = new IisExpressHelper();
+            var configPath =
+                Path.Combine(Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"..\..\..\")),
+                    "applicationhost.config");
+
+            Console.WriteLine($"Path to IIS Express configuration file '{configPath}'");
+
             _iisExpress = new IisExpressHelper
             {
-                ConfigPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "applicationhost.config"),
+                ConfigPath = configPath,
 
                 // Pass on connectionstring to codeRR.Server.Web during testing, overriding connectionstring in web.config
                 EnvironmentVariables = new Dictionary<string, string> { { "coderr_ConnectionString", _databaseManager.ConnectionString } }
@@ -51,7 +57,6 @@ static WebTest()
 
         protected WebTest()
         {
-
             TestData.ResetDatabase(_iisExpress.BaseUrl);
         }
 
@@ -61,7 +66,6 @@ protected WebTest()
 
         public static IWebDriver WebDriver { get; private set; }
 
-
         private static void DisposeWebDriver()
         {
             try

src/Server/Coderr.Server.Web.Tests/codeRR.Server.Web.Tests.csproj

@@ -25,7 +25,7 @@
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>applicationhost.tt</DependentUpon>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
     </None>
     <None Update="applicationhost.tt">
       <Generator>TextTemplatingFileGenerator</Generator>