From f65d2df7cf9868024af6762746970da9c0cc0a6a Mon Sep 17 00:00:00 2001
From: Aaron Yarborough <aaron@orangebus.co.uk>
Date: Fri, 10 Feb 2017 15:26:36 +0000
Subject: [PATCH] Fixed issues with script manager

---
 .../LoginManagers/LloydsLoginManager.cs              |  9 ---------
 BankingBot/BankingBot.csproj                         |  4 +++-
 BankingBot/ScriptManagement/ScriptBundles.cs         | 12 +++---------
 BankingBot/ScriptManagement/ScriptManager.cs         |  9 +++------
 BankingBot/ScriptManagement/Scripts/test.js          |  6 +++++-
 5 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/BankingBot/ActionManagers/LoginManagers/LloydsLoginManager.cs b/BankingBot/ActionManagers/LoginManagers/LloydsLoginManager.cs
index ffcba9b..13ccd1e 100644
--- a/BankingBot/ActionManagers/LoginManagers/LloydsLoginManager.cs
+++ b/BankingBot/ActionManagers/LoginManagers/LloydsLoginManager.cs
@@ -37,15 +37,6 @@ 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);
diff --git a/BankingBot/BankingBot.csproj b/BankingBot/BankingBot.csproj
index fbdaff6..46dc715 100644
--- a/BankingBot/BankingBot.csproj
+++ b/BankingBot/BankingBot.csproj
@@ -83,7 +83,9 @@
     <Content Include="ScriptManagement\Scripts\jquery-3.1.1.min.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="ScriptManagement\Scripts\test.js" />
+    <Content Include="ScriptManagement\Scripts\test.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/BankingBot/ScriptManagement/ScriptBundles.cs b/BankingBot/ScriptManagement/ScriptBundles.cs
index 7175ef5..822af3e 100644
--- a/BankingBot/ScriptManagement/ScriptBundles.cs
+++ b/BankingBot/ScriptManagement/ScriptBundles.cs
@@ -1,17 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BankingBot.ScriptManagement
+namespace BankingBot.ScriptManagement
 {
     public static class ScriptBundles
     {
         public static string[] Global => new[]
         {
-            "scripts/jquery-3.1.1.min",
-            "scripts/global.js"
+            "ScriptManagement/Scripts/jquery-3.1.1.min.js",
+            "ScriptManagement/Scripts/global.js"
         };
     }
 }
diff --git a/BankingBot/ScriptManagement/ScriptManager.cs b/BankingBot/ScriptManagement/ScriptManager.cs
index 23d6d5b..bc0f6a0 100644
--- a/BankingBot/ScriptManagement/ScriptManager.cs
+++ b/BankingBot/ScriptManagement/ScriptManager.cs
@@ -1,12 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using BankingBot.Contracts;
 using OpenQA.Selenium;
-using OpenQA.Selenium.Internal;
 
 namespace BankingBot.ScriptManagement
 {
@@ -30,6 +26,7 @@ namespace BankingBot.ScriptManagement
         {
             var script = GenerateScript(scriptPath, data, includedScripts);
             var executor = _browserBot.WebDriver as IJavaScriptExecutor;
+            executor.ExecuteScript(script);
         }
 
         private string GetIncludedScriptsCompilation(string currentCompliation, string[] scripts)
@@ -47,7 +44,7 @@ namespace BankingBot.ScriptManagement
 
         private string GetScriptContent(string scriptPath)
         {
-            return File.ReadAllText(scriptPath).Trim();
+            return File.ReadAllText(scriptPath).Trim() + Environment.NewLine;
         }
 
         private string GetScriptWithPopulatedData(string currentCompliation, Dictionary<string, string> data)
@@ -58,7 +55,7 @@ namespace BankingBot.ScriptManagement
                 foreach (var pair in data)
                 {
                     var placeholderText = string.Format(placeholderFormat, pair.Key);
-                    currentCompliation = currentCompliation.Replace(placeholderText, pair.Value);
+                    currentCompliation = currentCompliation.Replace(placeholderText, $"\"{pair.Value}\"");
                 }
             }
 
diff --git a/BankingBot/ScriptManagement/Scripts/test.js b/BankingBot/ScriptManagement/Scripts/test.js
index 4d3fe4b..9908344 100644
--- a/BankingBot/ScriptManagement/Scripts/test.js
+++ b/BankingBot/ScriptManagement/Scripts/test.js
@@ -1,6 +1,10 @@
 (function () {
     // Do the placeholders work?
-    var netVersion = __$netVersion;
+    //var netVersion = __$netVersion;
+
+    var name = __$name;
+    var age = __$age;
+    var isoldenough = __$isOldEnough;
 
     // Do the modules work?
     global.testFunction();