Script manager changes

BankingBot/ActionManagers/LoginManagers/LloydsLoginManager.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using BankingBot.Attributes;
 using BankingBot.Contracts;
@@ -6,6 +7,7 @@ using BankingBot.LoginCredentials;
 using OpenQA.Selenium;
 using BankingBot.Responses;
 using BankingBot.Enums;
+using BankingBot.ScriptManagement;
 
 namespace BankingBot.ActionManagers.LoginManagers
 {
@@ -20,10 +22,14 @@ namespace BankingBot.ActionManagers.LoginManagers
         }
 
         private readonly IBrowserBot _browserBot;
+        private readonly IScriptManager _scriptManager;
         
-        public LloydsLoginManager(IBrowserBot browserBot)
+        public LloydsLoginManager(
+            IBrowserBot browserBot,
+            IScriptManager scriptManager)
         {
             _browserBot = browserBot;
+            _scriptManager = scriptManager;
         }
 
         public Response Login(ILoginCredentials credentials)
@@ -31,6 +37,16 @@ namespace BankingBot.ActionManagers.LoginManagers
             var response = new Response();
             var lloydsCreds = (LloydsLoginCredentials)credentials;
 
+            var data = new Dictionary<string, string>
+            {
+                { "name", "aaron" },
+                { "age", "12" },
+                { "isOldEnough", "true" }
+            };
+
+            _scriptManager.Execute("scripts/test.js", data, ScriptBundles.Global);
+
+
             try
             {
                 LoginStep1(lloydsCreds);

BankingBot/BankingBot.csproj

@@ -58,6 +58,7 @@
     <Compile Include="Contracts\ILoginManager.cs" />
     <Compile Include="Contracts\IProviderLoginManager.cs" />
     <Compile Include="Contracts\IResponse.cs" />
+    <Compile Include="Contracts\IScriptManager.cs" />
     <Compile Include="Enums\Provider.cs" />
     <Compile Include="Enums\ResponseStatus.cs" />
     <Compile Include="LoginCredentials\LloydsLoginCredentials.cs" />
@@ -70,7 +71,6 @@
     <Compile Include="Responses\Response.cs" />
     <Compile Include="ScriptManagement\ScriptBundles.cs" />
     <Compile Include="ScriptManagement\ScriptManager.cs" />
-    <Compile Include="ScriptManagement\Scripts.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

BankingBot/Contracts/IScriptManager.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace BankingBot.Contracts
+{
+    public interface IScriptManager
+    {
+        T Execute<T>(string scriptPath, Dictionary<string, string> data, string[] scripts);
+        void Execute(string scriptPath, Dictionary<string, string> data, string[] scripts);
+    }
+}

BankingBot/ScriptManagement/ScriptManager.cs

@@ -10,7 +10,7 @@ using OpenQA.Selenium.Internal;
 
 namespace BankingBot.ScriptManagement
 {
-    public class ScriptManager
+    public class ScriptManager : IScriptManager
     {
         private readonly IBrowserBot _browserBot;
 
@@ -21,31 +21,57 @@ namespace BankingBot.ScriptManagement
 
         public T Execute<T>(string scriptPath, Dictionary<string, string> data = null, string[] includedScripts = null)
         {
-            var scriptContent = "";
+            var script = GenerateScript(scriptPath, data, includedScripts);
+            var executor = _browserBot.WebDriver as IJavaScriptExecutor;
+            return (T)executor.ExecuteScript(script);
+        }
 
-            if (includedScripts != null)
+        public void Execute(string scriptPath, Dictionary<string, string> data, string[] includedScripts = null)
+        {
+            var script = GenerateScript(scriptPath, data, includedScripts);
+            var executor = _browserBot.WebDriver as IJavaScriptExecutor;
+        }
+
+        private string GetIncludedScriptsCompilation(string currentCompliation, string[] scripts)
+        {
+            if (scripts != null)
             {
-                foreach (var script in includedScripts)
+                foreach (var script in scripts)
                 {
-                    var includedScriptContent = File.ReadAllText(script).Trim();
+                    currentCompliation += GetScriptContent(script);
-                    scriptContent += includedScriptContent;
                 }
             }
 
-            scriptContent += File.ReadAllText(scriptPath).Trim();
+            return currentCompliation;
+        }
 
+        private string GetScriptContent(string scriptPath)
+        {
+            return File.ReadAllText(scriptPath).Trim();
+        }
+
+        private string GetScriptWithPopulatedData(string currentCompliation, Dictionary<string, string> data)
+        {
             if (data != null)
             {
                 var placeholderFormat = "__${0}";
                 foreach (var pair in data)
                 {
                     var placeholderText = string.Format(placeholderFormat, pair.Key);
-                    scriptContent = scriptContent.Replace(placeholderText, pair.Value);
+                    currentCompliation = currentCompliation.Replace(placeholderText, pair.Value);
                 }
             }
 
-            var executor = _browserBot.WebDriver as IJavaScriptExecutor;
+            return currentCompliation;
-            return (T)executor.ExecuteScript(scriptContent);
+        }
+
+        private string GenerateScript(string scriptPath, Dictionary<string, string> data = null, string[] includedScripts = null)
+        {
+            var scriptContent = GetIncludedScriptsCompilation("", includedScripts);
+            scriptContent += GetScriptContent(scriptPath);
+            scriptContent = GetScriptWithPopulatedData(scriptContent, data);
+
+            return scriptContent;
         }
     }
 }