Backed out 4 changesets (bug 1604506, bug 1602547, bug 1602544) for failing at /printcmd.py and /user_prompts.py

Backed out changeset cad798d12930 (bug 1602544)
Backed out changeset 531ee079b538 (bug 1604506)
Backed out changeset 29c893010729 (bug 1604506)
Backed out changeset 43fd1d4b1ba1 (bug 1602547)

Author: raulgurzau

testing/geckodriver/src/command.rs

@@ -52,11 +52,6 @@ pub fn extension_routes() -> Vec<(Method, &'static str, GeckoExtensionRoute)> {
             "/session/{sessionId}/moz/screenshot/full",
             GeckoExtensionRoute::TakeFullScreenshot,
         ),
-        (
-            Method::POST,
-            "/session/{sessionId}/moz/print",
-            GeckoExtensionRoute::Print,
-        ),
     ];
 }
 
@@ -69,7 +64,6 @@ pub enum GeckoExtensionRoute {
     InstallAddon,
     UninstallAddon,
     TakeFullScreenshot,
-    Print,
 }
 
 impl WebDriverExtensionRoute for GeckoExtensionRoute {
@@ -114,7 +108,6 @@ impl WebDriverExtensionRoute for GeckoExtensionRoute {
                 GeckoExtensionCommand::UninstallAddon(serde_json::from_value(body_data.clone())?)
             }
             TakeFullScreenshot => GeckoExtensionCommand::TakeFullScreenshot,
-            Print => GeckoExtensionCommand::Print(serde_json::from_value(body_data.clone())?),
         };
 
         Ok(WebDriverCommand::Extension(command))
@@ -130,7 +123,6 @@ pub enum GeckoExtensionCommand {
     InstallAddon(AddonInstallParameters),
     UninstallAddon(AddonUninstallParameters),
     TakeFullScreenshot,
-    Print(PrintParameters),
 }
 
 impl WebDriverExtensionCommand for GeckoExtensionCommand {
@@ -144,7 +136,6 @@ impl WebDriverExtensionCommand for GeckoExtensionCommand {
             XblAnonymousByAttribute(_, x) => Some(serde_json::to_value(x).unwrap()),
             XblAnonymousChildren(_) => None,
             TakeFullScreenshot => None,
-            Print(x) => Some(serde_json::to_value(x).unwrap()),
         }
     }
 }
@@ -241,113 +232,6 @@ pub struct LogOptions {
     pub level: Option<logging::Level>,
 }
 
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(default, rename_all = "camelCase")]
-pub struct PrintParameters {
-    pub orientation: PrintOrientation,
-    #[serde(deserialize_with = "deserialize_to_print_scale_f64")]
-    pub scale: f64,
-    pub background: bool,
-    pub page: PrintPage,
-    pub margin: PrintMargins,
-    pub page_ranges: Vec<String>,
-    pub shrink_to_fit: bool,
-}
-
-impl Default for PrintParameters {
-    fn default() -> Self {
-        PrintParameters {
-            orientation: PrintOrientation::default(),
-            scale: 1.0,
-            background: false,
-            page: PrintPage::default(),
-            margin: PrintMargins::default(),
-            page_ranges: Vec::new(),
-            shrink_to_fit: true,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(rename_all = "lowercase")]
-pub enum PrintOrientation {
-    Landscape,
-    Portrait,
-}
-
-impl Default for PrintOrientation {
-    fn default() -> Self {
-        PrintOrientation::Portrait
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(default)]
-pub struct PrintPage {
-    #[serde(deserialize_with = "deserialize_to_positive_f64")]
-    pub width: f64,
-    #[serde(deserialize_with = "deserialize_to_positive_f64")]
-    pub height: f64,
-}
-
-impl Default for PrintPage {
-    fn default() -> Self {
-        PrintPage {
-            width: 21.59,
-            height: 27.94,
-        }
-    }
-}
-
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-#[serde(default)]
-pub struct PrintMargins {
-    #[serde(deserialize_with = "deserialize_to_positive_f64")]
-    pub top: f64,
-    #[serde(deserialize_with = "deserialize_to_positive_f64")]
-    pub bottom: f64,
-    #[serde(deserialize_with = "deserialize_to_positive_f64")]
-    pub left: f64,
-    #[serde(deserialize_with = "deserialize_to_positive_f64")]
-    pub right: f64,
-}
-
-impl Default for PrintMargins {
-    fn default() -> Self {
-        PrintMargins {
-            top: 1.0,
-            bottom: 1.0,
-            left: 1.0,
-            right: 1.0,
-        }
-    }
-}
-
-fn deserialize_to_positive_f64<'de, D>(deserializer: D) -> Result<f64, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let val = f64::deserialize(deserializer)?;
-    if val < 0.0 {
-        return Err(de::Error::custom(format!("{} is negative", val)));
-    };
-    Ok(val)
-}
-
-fn deserialize_to_print_scale_f64<'de, D>(deserializer: D) -> Result<f64, D::Error>
-where
-    D: Deserializer<'de>,
-{
-    let val = f64::deserialize(deserializer)?;
-    if val < 0.1 || val > 2.0 {
-        return Err(de::Error::custom(format!(
-            "{} is outside range 0.1-2",
-            val
-        )));
-    };
-    Ok(val)
-}
-
 #[cfg(test)]
 mod tests {
     use serde_json::json;
@@ -506,36 +390,4 @@ mod tests {
         assert!(serde_json::from_value::<P>(json!({"name": "foo"})).is_err());
         assert!(serde_json::from_value::<P>(json!({"name": "foo", "value": null})).is_err());
     }
-
-    #[test]
-    fn test_json_gecko_print_defaults() {
-        let params = PrintParameters::default();
-        assert_de(&params, json!({}));
-    }
-
-    #[test]
-    fn test_json_gecko_print() {
-        let params = PrintParameters {
-            orientation: PrintOrientation::Landscape,
-            page: PrintPage {
-                width: 10.0,
-                ..Default::default()
-            },
-            margin: PrintMargins {
-                top: 10.0,
-                ..Default::default()
-            },
-            scale: 1.5,
-            ..Default::default()
-        };
-        assert_de(
-            &params,
-            json!({"orientation": "landscape", "page": {"width": 10}, "margin": {"top": 10}, "scale": 1.5}),
-        );
-    }
-
-    #[test]
-    fn test_json_gecko_scale_invalid() {
-        assert!(serde_json::from_value::<AddonInstallParameters>(json!({"scale": 3})).is_err());
-    }
 }

testing/geckodriver/src/marionette.rs

@@ -1,8 +1,7 @@
 use crate::android::{AndroidHandler};
 use crate::command::{
     AddonInstallParameters, AddonUninstallParameters, GeckoContextParameters,
-    GeckoExtensionCommand, GeckoExtensionRoute, PrintParameters,
-    XblLocatorParameters, CHROME_ELEMENT_KEY,
+    GeckoExtensionCommand, GeckoExtensionRoute, XblLocatorParameters, CHROME_ELEMENT_KEY,
 };
 use marionette_rs::common::{
     Cookie as MarionetteCookie, Date as MarionetteDate, Frame as MarionetteFrame,
@@ -879,7 +878,6 @@ impl MarionetteSession {
                 InstallAddon(_) => WebDriverResponse::Generic(resp.into_value_response(true)?),
                 UninstallAddon(_) => WebDriverResponse::Void,
                 TakeFullScreenshot => WebDriverResponse::Generic(resp.into_value_response(true)?),
-                Print(_) => WebDriverResponse::Generic(resp.into_value_response(true)?),
             },
         })
     }
@@ -1158,7 +1156,6 @@ impl MarionetteCommand {
                 Extension(ref extension) => match extension {
                     GetContext => (Some("Marionette:GetContext"), None),
                     InstallAddon(x) => (Some("Addon:Install"), Some(x.to_marionette())),
-                    Print(x) => (Some("WebDriver:Print"), Some(x.to_marionette())),
                     SetContext(x) => (Some("Marionette:SetContext"), Some(x.to_marionette())),
                     UninstallAddon(x) => (Some("Addon:Uninstall"), Some(x.to_marionette())),
                     XblAnonymousByAttribute(e, x) => {
@@ -1535,16 +1532,6 @@ impl ToMarionette<Map<String, Value>> for GeckoContextParameters {
     }
 }
 
-impl ToMarionette<Map<String, Value>> for PrintParameters {
-    fn to_marionette(&self) -> WebDriverResult<Map<String, Value>> {
-        Ok(try_opt!(
-            serde_json::to_value(self)?.as_object(),
-            ErrorStatus::UnknownError,
-            "Expected an object").clone()
-        )
-    }
-}
-
 impl ToMarionette<Map<String, Value>> for XblLocatorParameters {
     fn to_marionette(&self) -> WebDriverResult<Map<String, Value>> {
         let mut value = Map::new();

testing/marionette/assert.js

@@ -242,26 +242,6 @@ assert.number = function(obj, msg = "") {
   return assert.that(Number.isFinite, msg)(obj);
 };
 
-/**
- * Asserts that <var>obj</var> is a positive number.
- *
- * @param {?} obj
- *     Value to test.
- * @param {string=} msg
- *     Custom error message.
- *
- * @return {number}
- *     <var>obj</var> is returned unaltered.
- *
- * @throws {InvalidArgumentError}
- *     If <var>obj</var> is not a positive integer.
- */
-assert.positiveNumber = function(obj, msg = "") {
-  assert.number(obj, msg);
-  msg = msg || pprint`Expected ${obj} to be >= 0`;
-  return assert.that(n => n >= 0, msg)(obj);
-};
-
 /**
  * Asserts that <var>obj</var> is callable.
  *