Skip to content

Commit

Permalink
WebDriver to Driver
Browse files Browse the repository at this point in the history
  • Loading branch information
@nvborisenko
nvborisenko committed Jan 15, 2024
1 parent 0e3253c commit 37ff061
Show file tree
Hide file tree
Showing 36 changed files with 174 additions and 174 deletions.
22 changes: 11 additions & 11 deletions src/Yapoml.Playwright.SourceGeneration/Templates/ComponentTemplate.scriban
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace {{namespace}}
where TConditions: global::Yapoml.Playwright.Components.BaseComponentConditions<TConditions>
where TCondition: global::Yapoml.Playwright.Components.BaseComponentConditions<TComponent>
{
public {{singular_name}}Component(global::Yapoml.Playwright.Components.BasePage page, global::Yapoml.Playwright.Components.BaseComponent parentComponent, global::Microsoft.Playwright.IPage webDriver, global::Yapoml.Playwright.Services.Locator.IElementHandler elementHandler, global::Yapoml.Playwright.Components.Metadata.ComponentMetadata metadata, global::Yapoml.Framework.Options.ISpaceOptions spaceOptions)
: base(page, parentComponent, webDriver, elementHandler, metadata, spaceOptions)
public {{singular_name}}Component(global::Yapoml.Playwright.Components.BasePage page, global::Yapoml.Playwright.Components.BaseComponent parentComponent, global::Microsoft.Playwright.IPage driver, global::Yapoml.Playwright.Services.Locator.IElementHandler elementHandler, global::Yapoml.Playwright.Components.Metadata.ComponentMetadata metadata, global::Yapoml.Framework.Options.ISpaceOptions spaceOptions)
: base(page, parentComponent, driver, elementHandler, metadata, spaceOptions)
{

}
Expand Down Expand Up @@ -41,15 +41,15 @@ namespace {{namespace}}
var metadata = new global::Yapoml.Playwright.Components.Metadata.ComponentMetadata() { Name = "{{singularize(component.original_name)}}" };
var listMetadata = new global::Yapoml.Playwright.Components.Metadata.ComponentsListMetadata() { Name = "{{component.original_name}}", ComponentMetadata = metadata };
var elementLocator = SpaceOptions.Services.Get<global::Yapoml.Playwright.Services.Locator.IElementLocator>();
var elementsListHandler = new global::Yapoml.Playwright.Services.Locator.ElementsListHandler(WebDriver, _elementHandler, elementLocator, by, listMetadata, _elementHandler.ElementHandlerRepository.CreateNestedRepository(), EventSource);
var elementsListHandler = new global::Yapoml.Playwright.Services.Locator.ElementsListHandler(Driver, _elementHandler, elementLocator, by, listMetadata, _elementHandler.ElementHandlerRepository.CreateNestedRepository(), EventSource);

var webElements = new {{component.singular_name}}ComponentList(Page, this, WebDriver, elementsListHandler, listMetadata, EventSource, SpaceOptions);
var webElements = new {{component.singular_name}}ComponentList(Page, this, Driver, elementsListHandler, listMetadata, EventSource, SpaceOptions);
return webElements;
{{ else }}
if (_elementHandler.ElementHandlerRepository.TryGet("{{component.name}}", out var cachedElementHandler))
{
var metadata = new global::Yapoml.Playwright.Components.Metadata.ComponentMetadata() { Name = "{{component.original_name}}" };
return SpaceOptions.Services.Get<global::Yapoml.Playwright.Services.Factory.IComponentFactory>().Create<{{get_component_return_type component}}, {{get_component_return_type component}}.ChainConditions, {{get_component_return_type component}}.OneTimeConditions>(Page, this, WebDriver, cachedElementHandler, metadata, SpaceOptions);
return SpaceOptions.Services.Get<global::Yapoml.Playwright.Services.Factory.IComponentFactory>().Create<{{get_component_return_type component}}, {{get_component_return_type component}}.ChainConditions, {{get_component_return_type component}}.OneTimeConditions>(Page, this, Driver, cachedElementHandler, metadata, SpaceOptions);
}
else
{
Expand All @@ -59,11 +59,11 @@ namespace {{namespace}}

var metadata = new global::Yapoml.Playwright.Components.Metadata.ComponentMetadata() { Name = "{{component.original_name}}" };
var elementLocator = SpaceOptions.Services.Get<global::Yapoml.Playwright.Services.Locator.IElementLocator>();
var elementHandler = new global::Yapoml.Playwright.Services.Locator.ElementHandler(WebDriver, _elementHandler, elementLocator, by, metadata, _elementHandler.ElementHandlerRepository.CreateNestedRepository(), EventSource);
var elementHandler = new global::Yapoml.Playwright.Services.Locator.ElementHandler(Driver, _elementHandler, elementLocator, by, metadata, _elementHandler.ElementHandlerRepository.CreateNestedRepository(), EventSource);

_elementHandler.ElementHandlerRepository.Set("{{component.name}}", elementHandler);

return SpaceOptions.Services.Get<global::Yapoml.Playwright.Services.Factory.IComponentFactory>().Create<{{get_component_return_type component}}, {{get_component_return_type component}}.ChainConditions, {{get_component_return_type component}}.OneTimeConditions>(Page, this, WebDriver, elementHandler, metadata, SpaceOptions);
return SpaceOptions.Services.Get<global::Yapoml.Playwright.Services.Factory.IComponentFactory>().Create<{{get_component_return_type component}}, {{get_component_return_type component}}.ChainConditions, {{get_component_return_type component}}.OneTimeConditions>(Page, this, Driver, elementHandler, metadata, SpaceOptions);
}
{{- end }}
}
Expand All @@ -84,13 +84,13 @@ namespace {{namespace}}
{{- if component.is_plural }}
var metadata = new global::Yapoml.Playwright.Components.Metadata.ComponentMetadata() { Name = "{{singularize(component.original_name)}}" };
var listMetadata = new global::Yapoml.Playwright.Components.Metadata.ComponentsListMetadata() { Name = "{{component.original_name}}", ComponentMetadata = metadata };
var elementsListHandler = new global::Yapoml.Playwright.Services.Locator.ElementsListHandler(WebDriver, _elementHandler, elementLocator, by, listMetadata, _elementHandler.ElementHandlerRepository.CreateNestedRepository(), EventSource);
var webElements = new {{component.singular_name}}ComponentList(Page, this, WebDriver, elementsListHandler, listMetadata, EventSource, SpaceOptions);
var elementsListHandler = new global::Yapoml.Playwright.Services.Locator.ElementsListHandler(Driver, _elementHandler, elementLocator, by, listMetadata, _elementHandler.ElementHandlerRepository.CreateNestedRepository(), EventSource);
var webElements = new {{component.singular_name}}ComponentList(Page, this, Driver, elementsListHandler, listMetadata, EventSource, SpaceOptions);
return webElements;
{{ else }}
var metadata = new global::Yapoml.Playwright.Components.Metadata.ComponentMetadata() { Name = "{{component.original_name}}" };
var elementHandler = new global::Yapoml.Playwright.Services.Locator.ElementHandler(WebDriver, _elementHandler, elementLocator, by, metadata, _elementHandler.ElementHandlerRepository.CreateNestedRepository(), EventSource);
return SpaceOptions.Services.Get<global::Yapoml.Playwright.Services.Factory.IComponentFactory>().Create<{{get_component_return_type component}}, {{get_component_return_type component}}.ChainConditions, {{get_component_return_type component}}.OneTimeConditions>(Page, this, WebDriver, elementHandler, metadata, SpaceOptions);
var elementHandler = new global::Yapoml.Playwright.Services.Locator.ElementHandler(Driver, _elementHandler, elementLocator, by, metadata, _elementHandler.ElementHandlerRepository.CreateNestedRepository(), EventSource);
return SpaceOptions.Services.Get<global::Yapoml.Playwright.Services.Factory.IComponentFactory>().Create<{{get_component_return_type component}}, {{get_component_return_type component}}.ChainConditions, {{get_component_return_type component}}.OneTimeConditions>(Page, this, Driver, elementHandler, metadata, SpaceOptions);
{{- end }}
}
{{ end }}
Expand Down
10 changes: 5 additions & 5 deletions src/Yapoml.Playwright.SourceGeneration/Templates/NestedComponentConditionsTemplate.scriban
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public {{get_component_return_type component}}.ChainConditions {{component.name}
{
if (ElementHandler.ElementHandlerRepository.TryGet("{{component.name}}", out var cachedElementHandler))
{
return new {{get_component_return_type component}}.ChainConditions(Timeout, PollingInterval, WebDriver, cachedElementHandler, ElementLocator, EventSource, Logger);
return new {{get_component_return_type component}}.ChainConditions(Timeout, PollingInterval, Driver, cachedElementHandler, ElementLocator, EventSource, Logger);
}
else
{
Expand All @@ -15,11 +15,11 @@ public {{get_component_return_type component}}.ChainConditions {{component.name}
{{ include 'ByTemplate' component }}

var metadata = new global::Yapoml.Playwright.Components.Metadata.ComponentMetadata() { Name = "{{component.original_name}}" };
var elementHandler = new global::Yapoml.Playwright.Services.Locator.ElementHandler(WebDriver, ElementHandler, ElementLocator, by, metadata, ElementHandler.ElementHandlerRepository.CreateNestedRepository(), EventSource);
var elementHandler = new global::Yapoml.Playwright.Services.Locator.ElementHandler(Driver, ElementHandler, ElementLocator, by, metadata, ElementHandler.ElementHandlerRepository.CreateNestedRepository(), EventSource);

ElementHandler.ElementHandlerRepository.Set("{{component.name}}", elementHandler);

return new {{get_component_return_type component}}.ChainConditions(Timeout, PollingInterval, WebDriver, elementHandler, ElementLocator, EventSource, Logger);
return new {{get_component_return_type component}}.ChainConditions(Timeout, PollingInterval, Driver, elementHandler, ElementLocator, EventSource, Logger);
}
}
}
Expand All @@ -34,9 +34,9 @@ public {{get_component_return_type component}}List.Conditions {{component.name}}

var metadata = new global::Yapoml.Playwright.Components.Metadata.ComponentMetadata() { Name = "{{singularize(component.original_name)}}" };
var listMetadata = new global::Yapoml.Playwright.Components.Metadata.ComponentsListMetadata() { Name = "{{component.original_name}}", ComponentMetadata = metadata };
var elementsListHandler = new global::Yapoml.Playwright.Services.Locator.ElementsListHandler(WebDriver, ElementHandler, ElementLocator, by, listMetadata, ElementHandler.ElementHandlerRepository.CreateNestedRepository(), EventSource);
var elementsListHandler = new global::Yapoml.Playwright.Services.Locator.ElementsListHandler(Driver, ElementHandler, ElementLocator, by, listMetadata, ElementHandler.ElementHandlerRepository.CreateNestedRepository(), EventSource);

return new {{component.singular_name}}ComponentList.Conditions(Timeout, PollingInterval, WebDriver, elementsListHandler, ElementLocator, EventSource, Logger);
return new {{component.singular_name}}ComponentList.Conditions(Timeout, PollingInterval, Driver, elementsListHandler, ElementLocator, EventSource, Logger);
}
}
{{ end }}
Expand Down
Loading

0 comments on commit 37ff061

Please sign in to comment.