Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/Server/Coderr.Server.SqlServer.Tests/Helpers/DatabaseManager.cs

Author: jgauffin

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

@@ -34,7 +34,7 @@ public DatabaseManager(string databaseName = null, Func<string> connectionString
             }
 
             var instanceId = Interlocked.Increment(ref InstanceCounter);
-            _databaseName = databaseName ?? $"coderTest{DateTime.Now:MMddHHmmss}_{instanceId}";
+            _databaseName = databaseName ?? $"coderrTest{DateTime.Now:MMddHHmmss}_{instanceId}";
             Console.WriteLine("DBNMAE: " + _databaseName);
             ConnectionString = connectionStringTemplateProvider()
                 .Replace("{databaseName}", _databaseName);

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

@@ -66,7 +66,6 @@ public void ActivateAccount(int accountId)
             }
         }
 
-
         /// <summary>
         ///     Creates an incident and a report.
         /// </summary>

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

@@ -1,5 +1,4 @@
 using System;
-using codeRR.Server.Api.Core.Incidents.Queries;
 using codeRR.Server.SqlServer.Core.Accounts;
 using codeRR.Server.SqlServer.Tests.Helpers;
 using Griffin.Data;

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

@@ -60,11 +60,10 @@ public void Start(string site)
             SetDefaultsWhereNecessary();
 
             if (!File.Exists(ExePath))
-                throw new FileNotFoundException("Path to IIS Express executable is invalid: '" + ExePath + "'.");
+                throw new FileNotFoundException($"Path to IIS Express executable is invalid: '{ExePath}'.");
 
             if (string.IsNullOrEmpty(ConfigPath) || !File.Exists(ConfigPath))
-                throw new FileNotFoundException("Path to IIS Express configuration file is invalid: '" + ConfigPath +
-                                                "'.");
+                throw new FileNotFoundException($"Path to IIS Express configuration file is invalid: '{ConfigPath}'.");
 
             var iisExpressThread = new Thread(() => StartIisExpress(p => _process = p, site)) {IsBackground = true};
             iisExpressThread.Start();
@@ -76,9 +75,9 @@ public void Start(string site)
                 Thread.Sleep(200);
                 attemptsLeft--;
             }
+
             if (_process == null)
                 throw new InvalidOperationException("Failed to start IIS express");
-
         }
 
         /// <summary>
@@ -155,7 +154,6 @@ private void StartIisExpress(Action<Process> action, string site)
             if (!isRunning)
                 throw new InvalidOperationException("Failed to receive data from IIS ex");
 
-
             action(process);
         }
     }

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

@@ -25,7 +25,6 @@ static WebTest()
             mapper.Scan(typeof(AccountRepository).Assembly);
             EntityMappingProvider.Provider = mapper;
 
-
             _databaseManager.CreateEmptyDatabase();
             _databaseManager.InitSchema();
 
@@ -39,12 +38,12 @@ static WebTest()
             _iisExpress = new IisExpressHelper
             {
                 ConfigPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "applicationhost.config"),
-                EnvironmentVariables =
-                    new Dictionary<string, string> { { "coderr_ConnectionString", _databaseManager.ConnectionString } }
+
+                // Pass on connectionstring to codeRR.Server.Web during testing, overriding connectionstring in web.config
+                EnvironmentVariables = new Dictionary<string, string> { { "coderr_ConnectionString", _databaseManager.ConnectionString } }
             };
             _iisExpress.Start("codeRR.Server.Web");
 
-
             TestData = new TestDataManager(_databaseManager.OpenConnection);
             WebDriver = DriverFactory.Create(BrowserType.Chrome);
             AppDomain.CurrentDomain.DomainUnload += (o, e) => { DisposeWebDriver(); };
@@ -56,7 +55,6 @@ protected WebTest()
             TestData.ResetDatabase(_iisExpress.BaseUrl);
         }
 
-
         public string ServerUrl => _iisExpress.BaseUrl;
 
         public static TestDataManager TestData { get; }