Skip to content

Commit

Permalink
Return selector strings where applicable
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam J. McIntyre committed Apr 9, 2015
1 parent e957d35 commit f5dd571
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 15 deletions.
4 changes: 2 additions & 2 deletions src/JQSelenium/JQSelenium.nuspec
View file
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>JQSelenium</id>
<version>1.7.1.0</version>
<version>1.7.2.0</version>
<title>JQSelenium</title>
<authors>Acklen Avenue / Communispace</authors>
<owners>Acklen Avenue / Communispace</owners>
Expand All @@ -11,7 +11,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>A C# wrapper of jQuery for Selenium WebDriver.</description>
<releaseNotes>Moving to CSpace nuget repo</releaseNotes>
<copyright>Copyright 2013 Acklen Avenue, LLC. Modified by ajm 2014.</copyright>
<copyright>Copyright 2013 Acklen Avenue, LLC. Modified by ajm 2014-2015.</copyright>
<tags>JQuery Selenium</tags>
<dependencies>
<dependency id="Selenium.WebDriver" version="2.33.0" />
Expand Down
33 changes: 22 additions & 11 deletions src/JQSelenium/JQuerySelector.cs
View file
Expand Up @@ -340,7 +340,7 @@ public JQuerySelector Children(string selector)
{
object preResult = ExecJs("", ".children(" + selector + ")");
List<IWebElement> webElements = ObjectToWebElementList(preResult);
return new JQuerySelector(selector + ".children()", webElements);
return new JQuerySelector(selector + ".children('" + selector + "')", webElements);
}

/// <summary>
Expand Down Expand Up @@ -557,7 +557,7 @@ public JQuerySelector Closest(string selector)
{
object result = ExecJs("", ".closest('" + selector + "')");
List<IWebElement> webElements = ObjectToWebElementList(result);
return new JQuerySelector(_selector + ".closest()", webElements);
return new JQuerySelector(_selector + ".closest('" + selector + "')", webElements);
}

/// <summary>
Expand All @@ -579,7 +579,7 @@ public JQuerySelector Next(string selector)
{
object result = ExecJs("", ".next('" + selector + "')");
List<IWebElement> webElements = ObjectToWebElementList(result);
return new JQuerySelector(selector + ".next()", webElements);
return new JQuerySelector(selector + ".next('" + selector + "')", webElements);
}

/// <summary>
Expand All @@ -603,7 +603,7 @@ public JQuerySelector NextAll(string selector)
{
object preResult = ExecJs("", ".nextAll('" + selector + "')");
List<IWebElement> webElements = ObjectToWebElementList(preResult);
return new JQuerySelector(_selector + ".nextAll()", webElements);
return new JQuerySelector(_selector + ".nextAll('" + selector + "')", webElements);
}

/// <summary>
Expand All @@ -614,7 +614,7 @@ public JQuerySelector NextUntil(string selector)
{
object preResult = ExecJs("", ".nextUntil('" + selector + "')");
List<IWebElement> webElements = ObjectToWebElementList(preResult);
return new JQuerySelector(_selector + ".nextUntil()", webElements);
return new JQuerySelector(_selector + ".nextUntil('" + selector + "')", webElements);
}

/// <summary>
Expand Down Expand Up @@ -693,6 +693,17 @@ public JQuerySelector Parent()
return new JQuerySelector(_selector + ".parent()", webElements);
}

/// <summary>
/// Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector.
/// </summary>
/// <returns> A JQuerySelector containing the parent of each element in the current set of elements. </returns>
public JQuerySelector Parents()
{
Object result = ExecJs("", ".parents()");
List<IWebElement> webElements = ObjectToWebElementList(result);
return new JQuerySelector(_selector + ".parents()", webElements);
}

/// <summary>
/// Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector.
/// </summary>
Expand All @@ -701,7 +712,7 @@ public JQuerySelector Parents(string selector)
{
Object result = ExecJs("", ".parents('" + selector + "')");
List<IWebElement> webElements = ObjectToWebElementList(result);
return new JQuerySelector(_selector + ".parents()", webElements);
return new JQuerySelector(_selector + ".parents('" + selector + "')", webElements);
}

/// <summary>
Expand All @@ -712,7 +723,7 @@ public JQuerySelector ParentsUntil(string selector)
{
Object result = ExecJs("", ".parentsUntil('" + selector + "')");
List<IWebElement> webElements = ObjectToWebElementList(result);
return new JQuerySelector(_selector + ".parentsUntil()", webElements);
return new JQuerySelector(_selector + ".parentsUntil('" + selector + "')", webElements);
}

/// <summary>
Expand All @@ -734,7 +745,7 @@ public JQuerySelector Prev(string selector)
{
object result = ExecJs("", ".prev('" + selector + "')");
List<IWebElement> webElements = ObjectToWebElementList(result);
return new JQuerySelector(selector + ".prev()", webElements);
return new JQuerySelector(selector + ".prev('" + selector + "')", webElements);
}

/// <summary>
Expand All @@ -756,7 +767,7 @@ public JQuerySelector PrevAll(string selector)
{
object preResult = ExecJs("", ".prevAll('" + selector + "')");
List<IWebElement> webElements = ObjectToWebElementList(preResult);
return new JQuerySelector(_selector + ".prevAll()", webElements);
return new JQuerySelector(_selector + ".prevAll('" + selector + "')", webElements);
}

/// <summary>
Expand All @@ -767,7 +778,7 @@ public JQuerySelector PrevUntil(string selector = "")
{
object preResult = ExecJs("", ".prevUntil('" + selector + "')");
List<IWebElement> webElements = ObjectToWebElementList(preResult);
return new JQuerySelector(_selector + ".prevUntil()", webElements);
return new JQuerySelector(_selector + ".prevUntil('" + selector + "')", webElements);
}

/// <summary>
Expand Down Expand Up @@ -833,7 +844,7 @@ public JQuerySelector Siblings(string selector = "")
{
object preResult = ExecJs("", ".siblings('" + selector + "')");
List<IWebElement> webElements = ObjectToWebElementList(preResult);
return new JQuerySelector(_selector + ".siblings()", webElements);
return new JQuerySelector(_selector + ".siblings('" + selector + "')", webElements);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions src/JQSelenium/Properties/AssemblyInfo.cs
View file
Expand Up @@ -11,5 +11,5 @@
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]
[assembly: Guid("d5e41af9-9363-42be-8492-9c39d67b8c60")]
[assembly: AssemblyVersion("1.7.1.0")]
[assembly: AssemblyFileVersion("1.7.1.0")]
[assembly: AssemblyVersion("1.7.2.0")]
[assembly: AssemblyFileVersion("1.7.2.0")]

0 comments on commit f5dd571

Please sign in to comment.