Skip to content
This repository has been archived by the owner on Jun 1, 2022. It is now read-only.

Commit

Permalink
Bumped new version: 2.46 (Build Number: 2015.06.05); Performance opti…
Browse files Browse the repository at this point in the history 
…mization: reduced browser closing time
  • Loading branch information
@dzharii
dzharii committed Jun 5, 2015
1 parent ffd62b1 commit f5c4f4b
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 39 deletions.
4 changes: 2 additions & 2 deletions SwdPageRecorder/SwdPageRecorder.TestModel/SwdPageRecorder.TestModel.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\TestStack.White.0.13.3\lib\net40\TestStack.White.dll</HintPath>
</Reference>
<Reference Include="WebDriver, Version=2.45.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="WebDriver, Version=2.46.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Selenium.WebDriver.2.45.0\lib\net40\WebDriver.dll</HintPath>
<HintPath>..\packages\Selenium.WebDriver.2.46.0\lib\net40\WebDriver.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion SwdPageRecorder/SwdPageRecorder.TestModel/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Castle.Core" version="3.3.3" targetFramework="net45" />
<package id="Selenium.WebDriver" version="2.45.0" targetFramework="net45" />
<package id="Selenium.WebDriver" version="2.46.0" targetFramework="net45" />
<package id="TestStack.White" version="0.13.3" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions SwdPageRecorder/SwdPageRecorder.Tests/SwdPageRecorder.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\TestStack.White.0.13.3\lib\net40\TestStack.White.dll</HintPath>
</Reference>
<Reference Include="WebDriver, Version=2.45.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="WebDriver, Version=2.46.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Selenium.WebDriver.2.45.0\lib\net40\WebDriver.dll</HintPath>
<HintPath>..\packages\Selenium.WebDriver.2.46.0\lib\net40\WebDriver.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion SwdPageRecorder/SwdPageRecorder.Tests/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<package id="Castle.Core" version="3.3.3" targetFramework="net45" />
<package id="FluentAssertions" version="3.3.0" targetFramework="net45" />
<package id="NUnitTestAdapter.WithFramework" version="1.2" targetFramework="net45" />
<package id="Selenium.WebDriver" version="2.45.0" targetFramework="net45" />
<package id="Selenium.WebDriver" version="2.46.0" targetFramework="net45" />
<package id="TestStack.White" version="0.13.3" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions SwdPageRecorder/SwdPageRecorder.UI/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

public class Build
{
public const string Version = "2015.04.14";
public const string WebDriverVersion = "v2.45";
public const string Version = "2015.06.05";
public const string WebDriverVersion = "v2.46";
}

10 changes: 0 additions & 10 deletions SwdPageRecorder/SwdPageRecorder.UI/SwdMain/Popups/BrowserScreenView.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ private void imgBox_Click(object sender, EventArgs args)
int absoluteY = mouse.Y; // + ;


var region = imgBox.GetSourceImageRegion();



absoluteX = (Convert.ToInt32(absoluteX / imgBox.ZoomFactor) + Convert.ToInt32(imgBox.HorizontalScroll.Value / imgBox.ZoomFactor)) ;
absoluteY = Convert.ToInt32(absoluteY / imgBox.ZoomFactor) + Convert.ToInt32(imgBox.VerticalScroll.Value / imgBox.ZoomFactor);

Expand All @@ -74,12 +70,6 @@ private void imgBox_Click(object sender, EventArgs args)
})(arguments[0], arguments[1]);";

SwdBrowser.ExecuteJavaScript(script, absoluteX, absoluteY);





//txtInfo =
}

private void imgBox_MouseWheel(object sender, MouseEventArgs e)
Expand Down
25 changes: 13 additions & 12 deletions SwdPageRecorder/SwdPageRecorder.UI/SwdMain/SwdMainView.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions SwdPageRecorder/SwdPageRecorder.UI/SwdPageRecorder.UI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="WebDriver, Version=2.45.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="WebDriver, Version=2.46.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Selenium.WebDriver.2.45.0\lib\net40\WebDriver.dll</HintPath>
<HintPath>..\packages\Selenium.WebDriver.2.46.0\lib\net40\WebDriver.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion SwdPageRecorder/SwdPageRecorder.UI/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
<package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="RazorEngine" version="3.6.1" targetFramework="net45" />
<package id="Selenium.WebDriver" version="2.45.0" targetFramework="net45" />
<package id="Selenium.WebDriver" version="2.46.0" targetFramework="net45" />
</packages>
19 changes: 16 additions & 3 deletions SwdPageRecorder/SwdPageRecorder.WebDriver/SwdBrowser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

using SwdPageRecorder.WebDriver.OpenQA.Selenium.Support.PageObjects;
using System.Reflection;
using System.Threading.Tasks;


namespace SwdPageRecorder.WebDriver
Expand Down Expand Up @@ -87,15 +88,27 @@ public static void CloseDriver()
bool success = true;
try
{
_driver.Close();
_driver.Dispose();
var tempDriver = _driver;

var closingTask = new Task(() =>
{
tempDriver.Close();
tempDriver.Dispose();
});

closingTask.Start();
// and no wait...

}
catch (Exception e)
{

MyLog.Exception(e);
success = true;
}
finally {
_driver = null;
}

// Fire OnDriverClosed
if (success && OnDriverClosed != null)
Expand Down
4 changes: 2 additions & 2 deletions SwdPageRecorder/SwdPageRecorder.WebDriver/SwdPageRecorder.WebDriver.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="WebDriver, Version=2.45.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="WebDriver, Version=2.46.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Selenium.WebDriver.2.45.0\lib\net40\WebDriver.dll</HintPath>
<HintPath>..\packages\Selenium.WebDriver.2.46.0\lib\net40\WebDriver.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion SwdPageRecorder/SwdPageRecorder.WebDriver/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="NLog" version="3.2.0.0" targetFramework="net45" />
<package id="Selenium.WebDriver" version="2.45.0" targetFramework="net45" />
<package id="Selenium.WebDriver" version="2.46.0" targetFramework="net45" />
</packages>

0 comments on commit f5c4f4b

Please sign in to comment.