Skip to content

Commit

Permalink
[dotnet] SlowLoadableComponent ignores UnableToLoadMessage
Browse files Browse the repository at this point in the history
Fixes issue #8550
  • Loading branch information
elgatov authored and jimevans committed Oct 12, 2021
1 parent d3b35ef commit 54aba4c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
10 changes: 7 additions & 3 deletions dotnet/src/support/UI/SlowLoadableComponent{T}.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <copyright file="SlowLoadableComponent{T}.cs" company="WebDriver Committers">
// <copyright file="SlowLoadableComponent{T}.cs" company="WebDriver Committers">
// Licensed to the Software Freedom Conservancy (SFC) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
Expand Down Expand Up @@ -104,8 +104,12 @@ public override T Load()
}
else
{
string timeoutMessage = string.Format(CultureInfo.InvariantCulture, "Timed out after {0} seconds.", this.timeout.TotalSeconds);
throw new WebDriverTimeoutException(timeoutMessage);
if (string.IsNullOrEmpty(UnableToLoadMessage))
{
this.UnableToLoadMessage = string.Format(CultureInfo.InvariantCulture, "Timed out after {0} seconds.", this.timeout.TotalSeconds);
}

throw new WebDriverTimeoutException(this.UnableToLoadMessage);
}
}

Expand Down
5 changes: 1 addition & 4 deletions dotnet/src/webdriver/Firefox/FirefoxAndroidOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ namespace OpenQA.Selenium.Firefox
/// </summary>
public class FirefoxAndroidOptions : AndroidOptions
{
private string androidPackage;
private string androidDeviceSerial;
private string androidActivity;
private List<string> androidIntentArguments = new List<string>();

/// <summary>
Expand All @@ -54,7 +51,7 @@ public ReadOnlyCollection<string> AndroidIntentArguments
/// <param name="arguments">The argument to add.</param>
public void AddIntentArgument(string argument)
{
this.AddIntentArguments(argument);
this.ddIntentArguments(argument);
}

/// <summary>
Expand Down

0 comments on commit 54aba4c

Please sign in to comment.