Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Behavioral.Automation.DemoBindings/Bootstrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,20 @@ public class Bootstrapper
private readonly IObjectContainer _objectContainer;
private readonly ITestRunner _runner;
private readonly DemoTestServicesBuilder _servicesBuilder;
private readonly BrowserContext _browserContext;
private readonly BrowserRunner _browserRunner;

public Bootstrapper(IObjectContainer objectContainer, ITestRunner runner, BrowserContext browserContext)
public Bootstrapper(IObjectContainer objectContainer, ITestRunner runner, BrowserRunner browserRunner)
{
_objectContainer = objectContainer;
_runner = runner;
_browserContext = browserContext;
_browserRunner = browserRunner;
_servicesBuilder = new DemoTestServicesBuilder(objectContainer, new TestServicesBuilder(_objectContainer));
}

[AfterScenario]
public void CloseBrowser()
{
_browserContext.CloseBrowser();
_browserRunner.CloseBrowser();
}

[BeforeScenario(Order = 0)]
Expand All @@ -34,7 +34,7 @@ public void Bootstrap()
_objectContainer.RegisterTypeAs<UserInterfaceBuilder, IUserInterfaceBuilder>();
_servicesBuilder.Build();
Assert.SetConsumer(_objectContainer.Resolve<IScenarioExecutionConsumer>());
_browserContext.OpenChrome();
_browserRunner.OpenChrome();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace Behavioral.Automation.Services
{
public class BrowserContext
public class BrowserRunner
{
public RemoteWebDriver Driver;

Expand Down
8 changes: 4 additions & 4 deletions src/Behavioral.Automation/Services/DriverService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ public sealed class DriverService : IDriverService
{
[NotNull]
private readonly IScopeContextManager _scopeContextManager;
private readonly BrowserContext _browserContext;
private readonly BrowserRunner _browserRunner;

public DriverService([NotNull] IScopeContextManager scopeContextManager, BrowserContext browserContext)
public DriverService([NotNull] IScopeContextManager scopeContextManager, BrowserRunner browserRunner)
{
_scopeContextManager = scopeContextManager;
_browserContext = browserContext;
_browserRunner = browserRunner;
}

public RemoteWebDriver Driver => _browserContext.Driver;
public RemoteWebDriver Driver => _browserRunner.Driver;

private readonly string SearchAttribute = ConfigServiceBase.SearchAttribute;

Expand Down