#66 Fill template variables of driver options capabilities and preferences

YevgeniyShunevych · YevgeniyShunevych · commit 36b75591887c · 2021-06-04T12:11:44.000+03:00
diff --git a/src/Atata.Configuration.Json/Mapping/ChromeDriverJsonMapper.cs b/src/Atata.Configuration.Json/Mapping/ChromeDriverJsonMapper.cs
@@ -17,7 +17,7 @@ protected override void MapOptions(DriverOptionsJsonSection section, ChromeOptio
             if (section.GlobalAdditionalCapabilities != null)
             {
                 foreach (var item in section.GlobalAdditionalCapabilities.ExtraPropertiesMap)
-                    options.AddAdditionalCapability(item.Key, item.Value, true);
+                    options.AddAdditionalCapability(item.Key, FillTemplateVariables(item.Value), true);
             }
 
             if (section.Proxy != null)
@@ -47,13 +47,13 @@ protected override void MapOptions(DriverOptionsJsonSection section, ChromeOptio
             if (section.UserProfilePreferences != null)
             {
                 foreach (var item in section.UserProfilePreferences.ExtraPropertiesMap)
-                    options.AddUserProfilePreference(item.Key, item.Value);
+                    options.AddUserProfilePreference(item.Key, FillTemplateVariables(item.Value));
             }
 
             if (section.LocalStatePreferences != null)
             {
                 foreach (var item in section.LocalStatePreferences.ExtraPropertiesMap)
-                    options.AddLocalStatePreference(item.Key, item.Value);
+                    options.AddLocalStatePreference(item.Key, FillTemplateVariables(item.Value));
             }
 
             if (!string.IsNullOrWhiteSpace(section.MobileEmulationDeviceName))
diff --git a/src/Atata.Configuration.Json/Mapping/DriverJsonMapper`3.cs b/src/Atata.Configuration.Json/Mapping/DriverJsonMapper`3.cs
@@ -75,7 +75,7 @@ protected virtual void MapOptions(DriverOptionsJsonSection section, TOptions opt
             if (section.AdditionalCapabilities != null)
             {
                 foreach (var item in section.AdditionalCapabilities.ExtraPropertiesMap)
-                    options.AddAdditionalCapability(item.Key, item.Value);
+                    options.AddAdditionalCapability(item.Key, FillTemplateVariables(item.Value));
             }
         }
 
@@ -93,5 +93,13 @@ private static string FormatDriverPath(string driverPath)
                 ? driverPath.Replace(BaseDirectoryVariable, AppDomain.CurrentDomain.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar))
                 : driverPath;
         }
+
+        protected static object FillTemplateVariables(object value) =>
+            value is string valueAsString
+                ? FillTemplateVariables(valueAsString)
+                : value;
+
+        protected static string FillTemplateVariables(string value) =>
+            AtataContext.Current?.FillTemplateString(value) ?? value;
     }
 }
diff --git a/src/Atata.Configuration.Json/Mapping/FirefoxDriverJsonMapper.cs b/src/Atata.Configuration.Json/Mapping/FirefoxDriverJsonMapper.cs
@@ -18,7 +18,7 @@ protected override void MapOptions(DriverOptionsJsonSection section, FirefoxOpti
             if (section.GlobalAdditionalCapabilities != null)
             {
                 foreach (var item in section.GlobalAdditionalCapabilities.ExtraPropertiesMap)
-                    options.AddAdditionalCapability(item.Key, item.Value, true);
+                    options.AddAdditionalCapability(item.Key, FillTemplateVariables(item.Value), true);
             }
 
             if (section.Proxy != null)
@@ -59,7 +59,7 @@ private void SetOptionsPreference(string name, object value, FirefoxOptions opti
                     options.SetPreference(name, castedValue);
                     break;
                 case string castedValue:
-                    options.SetPreference(name, castedValue);
+                    options.SetPreference(name, FillTemplateVariables(castedValue));
                     break;
                 case null:
                     options.SetPreference(name, null as string);
@@ -106,7 +106,7 @@ private void SetProfilePreference(string name, object value, FirefoxProfile prof
                     profile.SetPreference(name, castedValue);
                     break;
                 case string castedValue:
-                    profile.SetPreference(name, castedValue);
+                    profile.SetPreference(name, FillTemplateVariables(castedValue));
                     break;
                 case null:
                     throw new ArgumentNullException(nameof(value), $"Unsupported {nameof(FirefoxProfile)} preference value: null. Supports: string, int, bool.");
diff --git a/src/Atata.Configuration.Json/Mapping/InternetExplorerDriverJsonMapper.cs b/src/Atata.Configuration.Json/Mapping/InternetExplorerDriverJsonMapper.cs
@@ -16,7 +16,7 @@ protected override void MapOptions(DriverOptionsJsonSection section, InternetExp
             if (section.GlobalAdditionalCapabilities != null)
             {
                 foreach (var item in section.GlobalAdditionalCapabilities.ExtraPropertiesMap)
-                    options.AddAdditionalCapability(item.Key, item.Value, true);
+                    options.AddAdditionalCapability(item.Key, FillTemplateVariables(item.Value), true);
             }
 
             if (section.Proxy != null)
diff --git a/src/Atata.Configuration.Json/Mapping/OperaDriverJsonMapper.cs b/src/Atata.Configuration.Json/Mapping/OperaDriverJsonMapper.cs
@@ -17,7 +17,7 @@ protected override void MapOptions(DriverOptionsJsonSection section, OperaOption
             if (section.GlobalAdditionalCapabilities != null)
             {
                 foreach (var item in section.GlobalAdditionalCapabilities.ExtraPropertiesMap)
-                    options.AddAdditionalCapability(item.Key, item.Value, true);
+                    options.AddAdditionalCapability(item.Key, FillTemplateVariables(item.Value), true);
             }
 
             if (section.Proxy != null)
@@ -38,13 +38,13 @@ protected override void MapOptions(DriverOptionsJsonSection section, OperaOption
             if (section.UserProfilePreferences != null)
             {
                 foreach (var item in section.UserProfilePreferences.ExtraPropertiesMap)
-                    options.AddUserProfilePreference(item.Key, item.Value);
+                    options.AddUserProfilePreference(item.Key, FillTemplateVariables(item.Value));
             }
 
             if (section.LocalStatePreferences != null)
             {
                 foreach (var item in section.LocalStatePreferences.ExtraPropertiesMap)
-                    options.AddLocalStatePreference(item.Key, item.Value);
+                    options.AddLocalStatePreference(item.Key, FillTemplateVariables(item.Value));
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ protected override void MapOptions(DriverOptionsJsonSection section, ChromeOptio`
`17`	`17`	`if (section.GlobalAdditionalCapabilities != null)`
`18`	`18`	`{`
`19`	`19`	`foreach (var item in section.GlobalAdditionalCapabilities.ExtraPropertiesMap)`
`20`		`- options.AddAdditionalCapability(item.Key, item.Value, true);`
	`20`	`+ options.AddAdditionalCapability(item.Key, FillTemplateVariables(item.Value), true);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`if (section.Proxy != null)`
`@@ -47,13 +47,13 @@ protected override void MapOptions(DriverOptionsJsonSection section, ChromeOptio`
`47`	`47`	`if (section.UserProfilePreferences != null)`
`48`	`48`	`{`
`49`	`49`	`foreach (var item in section.UserProfilePreferences.ExtraPropertiesMap)`
`50`		`- options.AddUserProfilePreference(item.Key, item.Value);`
	`50`	`+ options.AddUserProfilePreference(item.Key, FillTemplateVariables(item.Value));`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`if (section.LocalStatePreferences != null)`
`54`	`54`	`{`
`55`	`55`	`foreach (var item in section.LocalStatePreferences.ExtraPropertiesMap)`
`56`		`- options.AddLocalStatePreference(item.Key, item.Value);`
	`56`	`+ options.AddLocalStatePreference(item.Key, FillTemplateVariables(item.Value));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if (!string.IsNullOrWhiteSpace(section.MobileEmulationDeviceName))`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ protected virtual void MapOptions(DriverOptionsJsonSection section, TOptions opt`
`75`	`75`	`if (section.AdditionalCapabilities != null)`
`76`	`76`	`{`
`77`	`77`	`foreach (var item in section.AdditionalCapabilities.ExtraPropertiesMap)`
`78`		`- options.AddAdditionalCapability(item.Key, item.Value);`
	`78`	`+ options.AddAdditionalCapability(item.Key, FillTemplateVariables(item.Value));`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`@@ -93,5 +93,13 @@ private static string FormatDriverPath(string driverPath)`
`93`	`93`	`? driverPath.Replace(BaseDirectoryVariable, AppDomain.CurrentDomain.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar))`
`94`	`94`	`: driverPath;`
`95`	`95`	`}`
	`96`	`+`
	`97`	`+ protected static object FillTemplateVariables(object value) =>`
	`98`	`+ value is string valueAsString`
	`99`	`+ ? FillTemplateVariables(valueAsString)`
	`100`	`+ : value;`
	`101`	`+`
	`102`	`+ protected static string FillTemplateVariables(string value) =>`
	`103`	`+ AtataContext.Current?.FillTemplateString(value) ?? value;`
`96`	`104`	`}`
`97`	`105`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ protected override void MapOptions(DriverOptionsJsonSection section, InternetExp`
`16`	`16`	`if (section.GlobalAdditionalCapabilities != null)`
`17`	`17`	`{`
`18`	`18`	`foreach (var item in section.GlobalAdditionalCapabilities.ExtraPropertiesMap)`
`19`		`- options.AddAdditionalCapability(item.Key, item.Value, true);`
	`19`	`+ options.AddAdditionalCapability(item.Key, FillTemplateVariables(item.Value), true);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`if (section.Proxy != null)`