Merge pull request #47 from adeel41/master

Ignore whitespace when using XenonElementsFinder TextIs method
LiquidThinking · Sep 16, 2015 · e4003d6 · e4003d6
2 parents 180a566 + 46f02b0
commit e4003d6
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -185,3 +185,4 @@ Xenon.sln.ide/
 /packages
 packages/
 *.ncrunchsolution
+.vs/config/applicationhost.config
diff --git a/Xenon.Tests/EmbeddedResourceLookup.cs b/Xenon.Tests/EmbeddedResourceLookup.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Reflection;
 using System.Text;
 
@@ -28,6 +29,8 @@ public string GetContent( string htmlFileName )
 		{
 			string resourceIdentifier = GetFullPath( htmlFileName );
 			var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream( resourceIdentifier );
+		    if ( stream == null )
+		        throw new ArgumentNullException( htmlFileName, "Unable to find following resource in the assembly: " + resourceIdentifier );
 			var content = new StreamReader( stream ).ReadToEnd();
 			return content;
 		}

diff --git a/Xenon.Tests/Integration/Startup.cs b/Xenon.Tests/Integration/Startup.cs
@@ -48,12 +48,13 @@ public void Configuration( IAppBuilder app )
 					formAsync.Wait();
 
 
-					PostbackResult = new NameValueCollection();
+					var postbackResult = new NameValueCollection();
 					foreach ( var val in formAsync.Result )
 					{
-						PostbackResult.Add( val.Key, String.Join(",",val.Value) );
+                        postbackResult.Add( val.Key, String.Join(",",val.Value) );
 					}
-                }
+				    PostbackResult = postbackResult;
+				}
 				return Task.Delay( 0 );
 
 			} );
@@ -64,8 +65,12 @@ public static NameValueCollection GetPostResult()
 			var startTime = DateTime.Now;
 			while ( startTime.AddMinutes( 2 ) > DateTime.Now )
 			{
-				if ( PostbackResult != null )
-					return PostbackResult;
+			    if ( PostbackResult != null )
+			    {
+			        var postbackResult = PostbackResult;
+			        PostbackResult = null;
+			        return postbackResult;
+			    }
 			}
 			return null;
 		}

diff --git a/Xenon.Tests/Xenon.Tests.csproj b/Xenon.Tests/Xenon.Tests.csproj
@@ -143,6 +143,7 @@
       <Link>chromedriver.exe</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <EmbeddedResource Include="XenonElementsFinderTests\Issue46_IgnoreWhiteSpace.html" />
     <EmbeddedResource Include="AssertTests\PageWithInputs.html" />
     <EmbeddedResource Include="InputTests\InputTests.html" />
   </ItemGroup>

diff --git a/Xenon.Tests/XenonElementsFinderTests/Issue46_IgnoreWhiteSpace.html b/Xenon.Tests/XenonElementsFinderTests/Issue46_IgnoreWhiteSpace.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+</head>
+<body>
+<a href="http://www.google.co.uk">
+    Hello World
+</a>
+</body>
+</html>
diff --git a/Xenon.Tests/XenonElementsFinderTests/XenonElementsFinderTests.cs b/Xenon.Tests/XenonElementsFinderTests/XenonElementsFinderTests.cs
@@ -59,6 +59,13 @@ public void AttributeIs_WhenMultipleAttributeIsAndTextIsMethodsAreUsed_ShouldFin
 				                                                         .Assert( a => a.ContainsElement( where => @where.TextIs( "Three" ) ) ) );
 		}
 
+	    [Test]
+	    public void TextIs_WhenContainsWhiteSpace_ShouldFindTheElement_Issue46()
+	    {
+	        StartTest( "Issue46_IgnoreWhiteSpace", xt =>
+	                                 xt.Assert( a => a.ContainsElement( where => where.TextIs( "Hello World" ) ) ) );
+	    }
+
 		[Test]
 		public void CriteriaDetails_WithAttributeIsCriteria_DisplaysAttributeCriteriaText()
 		{
@@ -72,7 +79,7 @@ public void CriteriaDetails_WithTextIsCriteria_DisplaysTextIsCriteriaText()
 		{
 			var finder = new XenonElementsFinder( null );
 			finder.TextIs( "Hello World" );
-			Assert.AreEqual( "(//input[@value='Hello World' and (@type='submit' or @type='button' or @type= 'reset' ) ] | //*[text() = 'Hello World'])", finder.CriteriaDetails() );
+			Assert.AreEqual( "(//input[@value='Hello World' and (@type='submit' or @type='button' or @type= 'reset' ) ] | //*[normalize-space(text()) = normalize-space('Hello World')])", finder.CriteriaDetails() );
 		}
 
 		[Test]

diff --git a/Xenon.nuspec b/Xenon.nuspec
@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd" >
 	<metadata>
 		<id>Xenon</id>
-		<version>0.1.7</version>
+		<version>0.1.8</version>
 		<title>Xenon</title>
 		<authors>Liquid Thinking</authors>
 		<projectUrl>https://github.com/LiquidThinking/Xenon</projectUrl>
@@ -14,7 +14,7 @@
 			There are the following pre-built browser automation wrappers:
 			http://www.nuget.org/packages/Xenon.Selenium/
 		</description>
-		<releaseNotes>Minor Change: Added Try Catch Block in WaitUntil</releaseNotes>
+		<releaseNotes>Minor Change: ignore whitespace when comparing using XenonElementsFinder </releaseNotes>
 		<dependencies>
 		</dependencies>
 	</metadata>

diff --git a/Xenon/Properties/AssemblyInfo.cs b/Xenon/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.7.0")]
-[assembly: AssemblyFileVersion("0.1.7.0")]
+[assembly: AssemblyVersion( "0.1.8.0" )]
+[assembly: AssemblyFileVersion( "0.1.8.0" )]
 [assembly: InternalsVisibleTo("Xenon.Selenium")]
diff --git a/Xenon/XenonElementsFinder.cs b/Xenon/XenonElementsFinder.cs
@@ -37,7 +37,7 @@ public virtual string CreateCriteriaForcingSearchAll()
 
 		private class FindByTextXpathCriteria : BaseXpathCriteria
 		{
-			private const string Format = "(//input[@value='{0}' and (@type='submit' or @type='button' or @type= 'reset' ) ] | //*[text() = '{0}'])";
+			private const string Format = "(//input[@value='{0}' and (@type='submit' or @type='button' or @type= 'reset' ) ] | //*[normalize-space(text()) = normalize-space('{0}')])";
 
 			public FindByTextXpathCriteria( string text ) : base( Format, text ) {}