@@ -31,32 +31,39 @@ public LocalBrowserFactory() : base()
3131 private Browser CreateBrowser ( )
3232 {
3333 var browserProfile = AqualityServices . Get < IBrowserProfile > ( ) ;
34+ var commandTimeout = AqualityServices . Get < ITimeoutConfiguration > ( ) . Command ;
3435 var browserName = browserProfile . BrowserName ;
3536 var driverSettings = browserProfile . DriverSettings ;
3637 RemoteWebDriver driver ;
3738 switch ( browserName )
3839 {
3940 case BrowserName . Chrome :
40- SetUpDriver ( new ChromeConfig ( ) , driverSettings ) ;
41- driver = new ChromeDriver ( ( ChromeOptions ) driverSettings . DriverOptions ) ;
41+ SetUpDriver ( new ChromeConfig ( ) , driverSettings ) ;
42+ driver = new ChromeDriver ( ChromeDriverService . CreateDefaultService ( ) ,
43+ ( ChromeOptions ) driverSettings . DriverOptions , commandTimeout ) ;
4244 break ;
4345 case BrowserName . Firefox :
4446 SetUpDriver ( new FirefoxConfig ( ) , driverSettings ) ;
45- driver = new FirefoxDriver ( ( FirefoxOptions ) driverSettings . DriverOptions ) ;
47+ driver = new FirefoxDriver ( FirefoxDriverService . CreateDefaultService ( ) ,
48+ ( FirefoxOptions ) driverSettings . DriverOptions , commandTimeout ) ;
4649 break ;
4750 case BrowserName . IExplorer :
4851 SetUpDriver ( new InternetExplorerConfig ( ) , driverSettings ) ;
49- driver = new InternetExplorerDriver ( ( InternetExplorerOptions ) driverSettings . DriverOptions ) ;
52+ driver = new InternetExplorerDriver ( InternetExplorerDriverService . CreateDefaultService ( ) ,
53+ ( InternetExplorerOptions ) driverSettings . DriverOptions , commandTimeout ) ;
5054 break ;
5155 case BrowserName . Edge :
52- driver = new EdgeDriver ( ( EdgeOptions ) driverSettings . DriverOptions ) ;
56+ driver = new EdgeDriver ( EdgeDriverService . CreateDefaultService ( ) ,
57+ ( EdgeOptions ) driverSettings . DriverOptions , commandTimeout ) ;
5358 break ;
5459 case BrowserName . Safari :
55- driver = new SafariDriver ( ( SafariOptions ) driverSettings . DriverOptions ) ;
60+ driver = new SafariDriver ( SafariDriverService . CreateDefaultService ( ) ,
61+ ( SafariOptions ) driverSettings . DriverOptions , commandTimeout ) ;
5662 break ;
5763 default :
5864 throw new ArgumentOutOfRangeException ( $ "Browser { browserName } is not supported.") ;
5965 }
66+
6067 return new Browser ( driver ) ;
6168 }
6269
0 commit comments