Update issue_cmd for boxed and non-boxed command types

- Remove `test_wrap_command` and `test_helpers` feature
- Refactor `issue_cmd` to accept impl `Into<Box<dyn WebDriverCompatibleCommand + Send + static>>`
- Introduce a `GetTitle` struct that implements `WebDriverCompatibleCommand`

Cargo.toml

@@ -22,7 +22,6 @@ license = "MIT OR Apache-2.0"
 default = ["native-tls"]
 native-tls = ["hyper-tls", "openssl"]
 rustls-tls = ["hyper-rustls"]
-test_helpers = []
 
 [dependencies]
 webdriver = { version = "0.50", default-features = false }
@@ -48,7 +47,6 @@ tokio = { version = "1", features = ["full"] }
 hyper = { version = "1.1.0", features = ["server"] }
 hyper-util = { version = "0.1.3", features = ["server", "http1"] }
 serial_test = "3.0"
-fantoccini = { path = "../fantoccini", features = ["test_helpers"] }
 
 # for minimal-versions
 [target.'cfg(any())'.dependencies]

src/lib.rs

@@ -266,6 +266,3 @@ pub mod wait;
 pub mod wd;
 #[doc(inline)]
 pub use wd::Locator;
-
-#[cfg(any(test, feature = "test_helpers"))]
-pub use crate::session::test_wrap_command;

src/session.rs

@@ -30,18 +30,6 @@ type Wcmd = WebDriverCommand<webdriver::command::VoidWebDriverExtensionCommand>;
 #[derive(Debug)]
 struct WcmdWrapper(Wcmd);
 
-/// Wraps a WebDriverCommand inside a WcmdWrapper and returns it as a
-/// Box<dyn WebDriverCompatibleCommand>.
-///
-/// This helper function is intended for use in tests where internal
-/// WebDriver commands need to be wrapped in the private `WcmdWrapper`
-#[cfg(any(test, feature = "test_helpers"))]
-pub fn test_wrap_command(
-    cmd: WebDriverCommand<webdriver::command::VoidWebDriverExtensionCommand>,
-) -> Box<dyn WebDriverCompatibleCommand + Send + 'static> {
-    Box::new(WcmdWrapper(cmd))
-}
-
 #[allow(clippy::large_enum_variant)]
 #[derive(Debug)]
 pub(crate) enum Cmd {
@@ -350,9 +338,9 @@ impl Client {
     /// Issue the specified [`WebDriverCompatibleCommand`] to the WebDriver instance.
     pub async fn issue_cmd(
         &self,
-        cmd: Box<dyn WebDriverCompatibleCommand + Send + 'static>,
+        cmd: impl Into<Box<dyn WebDriverCompatibleCommand + Send + 'static>>,
     ) -> Result<Json, error::CmdError> {
-        self.issue(Cmd::WebDriver(cmd)).await
+        self.issue(Cmd::WebDriver(cmd.into())).await
     }
 
     pub(crate) fn is_legacy(&self) -> bool {

tests/local.rs

@@ -1,16 +1,49 @@
 //! Tests that don't make use of external websites.
 use crate::common::{other_page_url, sample_page_url};
-use fantoccini::wd::TimeoutConfiguration;
-use fantoccini::{error, test_wrap_command, Client, Locator};
+use fantoccini::wd::{TimeoutConfiguration, WebDriverCompatibleCommand};
+use fantoccini::{error, Client, Locator};
 use http_body_util::BodyExt;
 use hyper::Method;
 use serial_test::serial;
 use std::time::Duration;
 use url::Url;
-use webdriver::command::WebDriverCommand;
 
 mod common;
 
+#[derive(Debug)]
+struct GetTitle;
+
+// Implement `WebDriverCompatibleCommand` for `GetTitle`
+impl WebDriverCompatibleCommand for GetTitle {
+    fn endpoint(
+        &self,
+        base_url: &url::Url,
+        session_id: Option<&str>,
+    ) -> Result<url::Url, url::ParseError> {
+        let base = base_url.join(&format!("session/{}/", session_id.unwrap()))?;
+        base.join("title")
+    }
+
+    fn method_and_body(&self, _: &url::Url) -> (http::Method, Option<String>) {
+        (http::Method::GET, None)
+    }
+
+    fn is_new_session(&self) -> bool {
+        false
+    }
+
+    fn is_legacy(&self) -> bool {
+        false
+    }
+}
+
+// Implement `Into<Box<dyn WebDriverCompatibleCommand + Send>>` for `GetTitle`
+impl Into<Box<dyn WebDriverCompatibleCommand + Send>> for GetTitle {
+    fn into(self) -> Box<dyn WebDriverCompatibleCommand + Send> {
+        Box::new(self)
+    }
+}
+
 async fn goto(c: Client, port: u16) -> Result<(), error::CmdError> {
     let url = sample_page_url(port);
     c.goto(&url).await?;
@@ -423,13 +456,9 @@ async fn timeouts(c: Client, _: u16) -> Result<(), error::CmdError> {
 async fn dynamic_commands(c: Client, port: u16) -> Result<(), error::CmdError> {
     let sample_url = sample_page_url(port);
     c.goto(&sample_url).await?;
-    let title = c
-        .issue_cmd(test_wrap_command(WebDriverCommand::GetTitle))
-        .await?;
+    let title = c.issue_cmd(GetTitle).await?;
     assert_eq!(title.as_str(), Some("Sample Page"));
-    let title = c
-        .issue_cmd(test_wrap_command(WebDriverCommand::GetTitle))
-        .await?;
+    let title = c.issue_cmd(GetTitle).await?;
     assert_eq!(title.as_str(), Some("Sample Page"));
     Ok(())
 }