summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRui Marinho <me@ruimarinho.net>2016-04-19 06:47:25 (GMT)
committerJason Smith <jason.smith@xamarin.com>2016-04-19 06:47:25 (GMT)
commit5f762bdc25d7d38ce751d33baa1072868ed8061d (patch)
treedde7b0be0c98af94cc279232d1ce296193ff00cb
parent0d57b35f21b9499876c65c7be6d11637543605aa (diff)
downloadxamarin-forms-5f762bdc25d7d38ce751d33baa1072868ed8061d.zip
xamarin-forms-5f762bdc25d7d38ce751d33baa1072868ed8061d.tar.gz
xamarin-forms-5f762bdc25d7d38ce751d33baa1072868ed8061d.tar.bz2
[iOS] Fix uitests on iPhone5 (#105)
-rw-r--r--Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj7
-rw-r--r--Xamarin.Forms.ControlGallery.iOS/packages.config2
-rw-r--r--Xamarin.Forms.Core.iOS.UITests/Tests/ActionSheetUITests.cs4
3 files changed, 6 insertions, 7 deletions
diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
index 6bf11df..0b0f5b1 100644
--- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
+++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
@@ -231,10 +231,6 @@
<BundleResource Include="test.jpg" />
</ItemGroup>
<ItemGroup>
- <Reference Include="Calabash, Version=18.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065, processorArchitecture=MSIL">
- <HintPath>..\packages\Xamarin.TestCloud.Agent.0.18.0\lib\Xamarin.iOS10\Calabash.dll</HintPath>
- <Private>True</Private>
- </Reference>
<Reference Include="PLCrashReporterUnifiedBinding, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Xamarin.Insights.1.11.4\lib\Xamarin.iOS10\PLCrashReporterUnifiedBinding.dll</HintPath>
<Private>True</Private>
@@ -247,6 +243,9 @@
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.iOS" />
+ <Reference Include="Calabash">
+ <HintPath>..\packages\Xamarin.TestCloud.Agent.0.19.0\lib\Xamarin.iOS10\Calabash.dll</HintPath>
+ </Reference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
diff --git a/Xamarin.Forms.ControlGallery.iOS/packages.config b/Xamarin.Forms.ControlGallery.iOS/packages.config
index 9749cf1..e3a4dde 100644
--- a/Xamarin.Forms.ControlGallery.iOS/packages.config
+++ b/Xamarin.Forms.ControlGallery.iOS/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Xamarin.Insights" version="1.11.4" targetFramework="xamarinios10" />
- <package id="Xamarin.TestCloud.Agent" version="0.18.0" targetFramework="xamarinios10" />
+ <package id="Xamarin.TestCloud.Agent" version="0.19.0" targetFramework="xamarinios10" />
</packages> \ No newline at end of file
diff --git a/Xamarin.Forms.Core.iOS.UITests/Tests/ActionSheetUITests.cs b/Xamarin.Forms.Core.iOS.UITests/Tests/ActionSheetUITests.cs
index 9899d02..cf03b70 100644
--- a/Xamarin.Forms.Core.iOS.UITests/Tests/ActionSheetUITests.cs
+++ b/Xamarin.Forms.Core.iOS.UITests/Tests/ActionSheetUITests.cs
@@ -24,8 +24,8 @@ namespace Xamarin.Forms.Core.UITests
static void CheckExtras ()
{
- App.WaitForElement (c => c.Marked ("Extra One"));
- App.WaitForElement (c => c.Marked ("Extra Eight"));
+ App.WaitForElement(c => c.Marked("Extra One"));
+ App.WaitForElement(c => c.Marked("Extra Six"));
}
protected override void TestSetup ()