geckodriver: Merge pull request #235 from andreastt/webdriver-port-alias

Add --webdriver-port argument back as a hidden alias

Source-Repo: https://github.com/mozilla/geckodriver
Source-Revision: 72c4a05273dbc898cd07643265b933ff61cee04b

--HG--
extra : rebase_source : 919b903294473889cac09b4ac91e95a2507d2abc

testing/geckodriver/CHANGES.md

@@ -11,6 +11,7 @@ All notable changes to this program is documented in this file.
   - The `binary`, `args`, and `profile` entries on this dictionary is equivalent to the old `firefox_binary`, `firefox_args`, and `firefox_profile` capabilities, which have now all been removed
   - The `log` capability takes a dictionary such as `{log: "trace"}` to enable trace level verbosity in Gecko
   - The `prefs` capability lets you define Firefox preferences through capabilities
+- Re-introduced the `--webdriver-port` argument as a hidden alias to `--port`
 
 ### Changed
 - `firefox_binary`, `firefox_args`, and `firefox_profile` capabilities removed in favour of the `firefoxOptions` dictionary detailed above and in the README

testing/geckodriver/src/main.rs

@@ -88,12 +88,17 @@ fn app<'a, 'b>() -> App<'a, 'b> {
              .value_name("HOST")
              .help("Host ip to use for WebDriver server (default: 127.0.0.1)")
              .takes_value(true))
+        .arg(Arg::with_name("webdriver_port_alias")
+             .long("--webdriver-port")
+             .takes_value(true)
+             .hidden(true))
         .arg(Arg::with_name("webdriver_port")
              .short("p")
              .long("port")
              .value_name("PORT")
              .help("Port to use for WebDriver server (default: 4444)")
-             .takes_value(true))
+             .takes_value(true)
+             .conflicts_with("webdriver_port_alias"))
         .arg(Arg::with_name("binary")
              .short("b")
              .long("binary")
@@ -141,7 +146,9 @@ You can obtain a copy of the license at https://mozilla.org/MPL/2.0/.");
     }
 
     let host = matches.value_of("webdriver_host").unwrap_or("127.0.0.1");
-    let port = match u16::from_str(matches.value_of("webdriver_port").unwrap_or("4444")) {
+    let port = match u16::from_str(matches.value_of("webdriver_port")
+        .or(matches.value_of("webdriver_port_alias"))
+        .unwrap_or("4444")) {
         Ok(x) => x,
         Err(_) => return Err((ExitCode::Usage, "invalid WebDriver port".to_owned())),
     };