11using System ;
22using System . Collections . Generic ;
33using System . IO ;
4+ using codeRR . Server . SqlServer . Core . Accounts ;
45using codeRR . Server . SqlServer . Tests . Helpers ;
56using codeRR . Server . Web . Tests . Helpers ;
67using codeRR . Server . Web . Tests . Helpers . Selenium ;
78using codeRR . Server . Web . Tests . Helpers . xUnit ;
9+ using Griffin . Data . Mapper ;
810using OpenQA . Selenium ;
911using OpenQA . Selenium . Support . Extensions ;
1012using Xunit ;
@@ -16,10 +18,14 @@ public abstract class WebTest
1618 {
1719 private static readonly IisExpressHelper _iisExpress ;
1820 private static readonly DatabaseManager _databaseManager = new DatabaseManager ( ) ;
19- private bool _disposed ;
2021
2122 static WebTest ( )
2223 {
24+ var mapper = new AssemblyScanningMappingProvider ( ) ;
25+ mapper . Scan ( typeof ( AccountRepository ) . Assembly ) ;
26+ EntityMappingProvider . Provider = mapper ;
27+
28+
2329 _databaseManager . CreateEmptyDatabase ( ) ;
2430 _databaseManager . InitSchema ( ) ;
2531
@@ -40,12 +46,13 @@ static WebTest()
4046
4147
4248 TestData = new TestDataManager ( _databaseManager . OpenConnection ) ;
49+ WebDriver = DriverFactory . Create ( BrowserType . Chrome ) ;
50+ AppDomain . CurrentDomain . DomainUnload += ( o , e ) => { DisposeWebDriver ( ) ; } ;
4351 }
4452
4553 protected WebTest ( )
4654 {
47- WebDriver = DriverFactory . Create ( BrowserType . Chrome ) ;
48- AppDomain . CurrentDomain . DomainUnload += ( o , e ) => { Dispose ( ) ; } ;
55+
4956 TestData . ResetDatabase ( _iisExpress . BaseUrl ) ;
5057 }
5158
@@ -54,14 +61,11 @@ protected WebTest()
5461
5562 public static TestDataManager TestData { get ; }
5663
57- public IWebDriver WebDriver { get ; private set ; }
64+ public static IWebDriver WebDriver { get ; private set ; }
5865
5966
60- public void Dispose ( )
67+ private static void DisposeWebDriver ( )
6168 {
62- if ( _disposed )
63- return ;
64- _disposed = true ;
6569 try
6670 {
6771 WebDriver . Quit ( ) ;
@@ -70,6 +74,7 @@ public void Dispose()
7074 catch
7175 {
7276 }
77+
7378 WebDriver . Dispose ( ) ;
7479 }
7580
0 commit comments