Merge branch 'master' into dev/crutkas/upgradeNuget

This commit is contained in:
Clint Rutkas
2020-11-03 10:57:50 -08:00
committed by GitHub
432 changed files with 7397 additions and 3096 deletions

View File

@@ -1,4 +1,4 @@
using System.IO;
using System.IO.Abstractions;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Newtonsoft.Json.Linq;
using OpenQA.Selenium;
@@ -11,6 +11,9 @@ namespace PowerToysTests
[TestClass]
public class FancyZonesEditorCustomLayoutsTests : FancyZonesEditor
{
private static readonly IFileSystem FileSystem = new FileSystem();
private static readonly IFile File = FileSystem.File;
private void SetLayoutName(string name)
{
AppiumWebElement textBox = creatorWindow.FindElementByClassName("TextBox");

View File

@@ -1,4 +1,4 @@
using System.IO;
using System.IO.Abstractions;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using OpenQA.Selenium.Appium;
using OpenQA.Selenium.Appium.Windows;
@@ -9,6 +9,9 @@ namespace PowerToysTests
[TestClass]
public class FancyZonesEditorOpeningTests : FancyZonesEditor
{
private static readonly IFileSystem FileSystem = new FileSystem();
private static readonly IFile File = FileSystem.File;
private static readonly IDirectory Directory = FileSystem.Directory;
void RemoveSettingsFile()
{
File.Delete(_zoneSettingsPath);

View File

@@ -1,5 +1,6 @@
using System;
using System.IO;
using System.IO.Abstractions;
//using System.IO;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Newtonsoft.Json.Linq;
using OpenQA.Selenium;
@@ -10,6 +11,9 @@ namespace PowerToysTests
[TestClass]
public class FancyZonesEditorSettingsTests : FancyZonesEditor
{
private static readonly IFileSystem FileSystem = new FileSystem();
private static readonly IFile File = FileSystem.File;
private const string editorZoneCount = "editor-zone-count";
private const string editorShowSpacing = "editor-show-spacing";
private const string editorSpacing = "editor-spacing";

View File

@@ -1,4 +1,4 @@
using System.IO;
using System.IO.Abstractions;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Newtonsoft.Json.Linq;
@@ -7,6 +7,9 @@ namespace PowerToysTests
[TestClass]
public class FancyZonesEditorTemplatesApplyTests : FancyZonesEditor
{
private static readonly IFileSystem FileSystem = new FileSystem();
private static readonly IFile File = FileSystem.File;
private void ApplyLayout(string tabName)
{
editorWindow.FindElementByName(tabName).Click();

View File

@@ -1,4 +1,4 @@
using System.IO;
using System.IO.Abstractions;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Newtonsoft.Json.Linq;
using OpenQA.Selenium.Appium;
@@ -9,6 +9,8 @@ namespace PowerToysTests
[TestClass]
public class FancyZonesEditorTemplatesEditTests : FancyZonesEditor
{
private static readonly IFileSystem FileSystem = new FileSystem();
private static readonly IFile File = FileSystem.File;
private void ChangeLayout()
{
new Actions(session).MoveToElement(creatorWindow.FindElementByAccessibilityId("PART_TitleBar")).MoveByOffset(0, -50).Click().Perform();

View File

@@ -1,7 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.IO;
using System.IO.Abstractions;
using System.Linq;
using System.Windows.Forms;
using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -16,6 +16,10 @@ namespace PowerToysTests
[TestClass]
public class FancyZonesSettingsTests : PowerToysSession
{
private static readonly IFileSystem FileSystem = new FileSystem();
private static readonly IFile File = FileSystem.File;
private JObject _initialSettingsJson;
private static WindowsElement _saveButton;

View File

@@ -1,6 +1,5 @@
using System;
using System.Diagnostics;
using System.IO;
using System.IO.Abstractions;
using System.Threading;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Newtonsoft.Json.Linq;
@@ -13,6 +12,11 @@ namespace PowerToysTests
{
public class PowerToysSession
{
private static readonly IFileSystem FileSystem = new FileSystem();
private static readonly IPath Path = FileSystem.Path;
private static readonly IFile File = FileSystem.File;
private static readonly IDirectory Directory = FileSystem.Directory;
protected const string WindowsApplicationDriverUrl = "http://127.0.0.1:4723";
protected const string AppPath = "C:\\Program Files\\PowerToys\\PowerToys.exe";

View File

@@ -8,4 +8,5 @@
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net461" />
<package id="Selenium.Support" version="3.141.0" targetFramework="net461" />
<package id="Selenium.WebDriver" version="3.141.0" targetFramework="net461" />
<package id="System.IO.Abstractions" version="12.2.5" targetFramework="net472" />
</packages>

View File

@@ -109,6 +109,9 @@
<HintPath>C:\Windows\Microsoft.NET\assembly\GAC_MSIL\System.Core\v4.0_4.0.0.0__b77a5c561934e089\System.Core.dll</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Abstractions, Version=12.0.0.0, Culture=neutral, PublicKeyToken=96bf224d23c43e59, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.IO.Abstractions.12.2.5\lib\net461\System.IO.Abstractions.dll</HintPath>
</Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="WebDriver, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Selenium.WebDriver.3.141.0\lib\net45\WebDriver.dll</HintPath>