aaron/banking-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed issues with script manager

Browse source
This commit is contained in:
Aaron Yarborough 2017-02-10 15:26:36 +00:00
parent b63f2eb3f7
commit f65d2df7cf
5 changed files with 14 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
BankingBot/ActionManagers/LoginManagers/LloydsLoginManager.cs
View file

@ -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);

4
BankingBot/BankingBot.csproj
View file

@ -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.

12
BankingBot/ScriptManagement/ScriptBundles.cs
View file

@ -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"
};
}
}

9
BankingBot/ScriptManagement/ScriptManager.cs
View file

@ -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}\"");
}
}

6
BankingBot/ScriptManagement/Scripts/test.js
View file

@ -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();