Merge pull request #1 from mohe2015/mohe2015-ci

Add CI and format code

Author: TahaHachana

.github/workflows/rust.yml

@@ -0,0 +1,24 @@
+name: Rust
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Check formatting
+      run: cargo fmt --check
+    - name: Build
+      run: cargo build --verbose
+    #- name: Run tests
+    #  run: cargo test --verbose

src/command_sender.rs

@@ -84,9 +84,8 @@ pub async fn send_command<T: Serialize, U: DeserializeOwned>(
             CommandError::OneshotReceiverError(e)
         })?;
 
-    
     debug!("Received response: {:?}", response);
-    
+
     let rslt = response.get(RESULT_KEY).ok_or_else(|| {
         error!("Missing result in the response: {:?}", response);
         CommandError::MissingResult

src/commands/input.rs

@@ -6,8 +6,8 @@ use super::id;
 use super::utils;
 use crate::define_command;
 use crate::error::CommandError;
-use crate::remote::input::*;
 use crate::local::result_data::EmptyResult;
+use crate::remote::input::*;
 use crate::session::WebDriverBiDiSession;
 
 // --------------------------------------------------
@@ -37,4 +37,4 @@ define_command!(
     SetFilesParameters,
     set_files,
     EmptyResult
-);
+);

src/commands/utils.rs

@@ -16,7 +16,6 @@ where
     C: Serialize,
     R: for<'de> Deserialize<'de>,
 {
-    
     match session.send_command::<C, R>(command).await {
         Ok(rslt) => {
             // debug!("Command with id: {} succeeded", command_id); // Log success

src/lib.rs

@@ -14,10 +14,10 @@ mod commands {
     pub mod session;
     #[macro_use]
     mod utils;
+    pub mod input;
     pub mod network;
     pub mod script;
     pub mod storage;
-    pub mod input;
     pub mod web_extension;
 }
 mod command_sender;

src/message_handler.rs

@@ -16,8 +16,8 @@ use tokio_tungstenite::{MaybeTlsStream, WebSocketStream};
 
 // --------------------------------------------------
 
-use crate::session::EventHandler;
 use crate::events::EventType;
+use crate::session::EventHandler;
 
 // --------------------------------------------------
 
@@ -67,9 +67,8 @@ pub async fn handle_messages(
                     } else if json.get(TYPE_FIELD).and_then(|t| t.as_str())
                         == Some(EVENT_TYPE_VALUE)
                     {
-                        if let Some(event_type_str) = json
-                            .get(METHOD_FIELD)
-                            .and_then(|method| method.as_str())
+                        if let Some(event_type_str) =
+                            json.get(METHOD_FIELD).and_then(|method| method.as_str())
                         {
                             if let Ok(event_type) = EventType::from_str(event_type_str) {
                                 let event_handlers = Arc::clone(&event_handlers);

src/models/remote/script.rs

@@ -1,7 +1,7 @@
 #![allow(clippy::all)]
 
-use crate::remote::browsing_context::BrowsingContext;
 use crate::remote::browser::UserContext;
+use crate::remote::browsing_context::BrowsingContext;
 use crate::remote::{Extensible, JsUint};
 use serde::{Deserialize, Serialize};
 
@@ -1209,7 +1209,7 @@ pub struct AddPreloadScriptParameters {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub contexts: Option<Vec<BrowsingContext>>,
     #[serde(skip_serializing_if = "Option::is_none", rename = "userContexts")]
-    pub user_contexts: Option<Vec<UserContext>>,    
+    pub user_contexts: Option<Vec<UserContext>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub sandbox: Option<String>,
 }

tests/browser.rs

@@ -307,7 +307,7 @@ mod remove_user_context {
     }
 
     #[tokio::test]
-    async fn test_remove_context_closes_contexts()  -> Result<()> {
+    async fn test_remove_context_closes_contexts() -> Result<()> {
         let mut bidi_session = utils::session::init().await?;
 
         let events = Arc::new(Mutex::new(Vec::<serde_json::Value>::new()));
@@ -338,51 +338,39 @@ mod remove_user_context {
                 None,
                 None,
             ))
-            .await
-            ?;
+            .await?;
 
         let user_context_1 = utils::create_user_context(&mut bidi_session).await?;
         let user_context_2 = utils::create_user_context(&mut bidi_session).await?;
 
-        let context_1 = utils::new_tab_in_user_context(&mut bidi_session, user_context_1.clone())
-            .await
-            ?;
+        let context_1 =
+            utils::new_tab_in_user_context(&mut bidi_session, user_context_1.clone()).await?;
 
-        let context_2 = utils::new_tab_in_user_context(&mut bidi_session, user_context_1.clone())
-            .await
-            ?;
+        let context_2 =
+            utils::new_tab_in_user_context(&mut bidi_session, user_context_1.clone()).await?;
 
-        let context_3 = utils::new_tab_in_user_context(&mut bidi_session, user_context_2.clone())
-            .await
-            ?;
+        let context_3 =
+            utils::new_tab_in_user_context(&mut bidi_session, user_context_2.clone()).await?;
 
-        let context_4 = utils::new_tab_in_user_context(&mut bidi_session, user_context_2.clone())
-            .await
-            ?;
+        let context_4 =
+            utils::new_tab_in_user_context(&mut bidi_session, user_context_2.clone()).await?;
 
         bidi_session
             .browser_remove_user_context(RemoveUserContextParameters::new(user_context_1))
-            .await
-            ?;
+            .await?;
 
         let initial_events_len = events.lock().await.len();
 
         let initial_destroyed_contexts = events
             .lock()
             .await
             .iter()
-            .map(|event| {
-                event.clone()["params"]["context"]
-                    .as_str()
-                    ?
-                    .to_string()
-            })
+            .map(|event| event.clone()["params"]["context"].as_str()?.to_string())
             .collect::<Vec<_>>();
 
         bidi_session
             .browser_remove_user_context(RemoveUserContextParameters::new(user_context_2))
-            .await
-            ?;
+            .await?;
 
         utils::close_session(&mut bidi_session).await?;
 
@@ -392,12 +380,7 @@ mod remove_user_context {
             .lock()
             .await
             .iter()
-            .map(|event| {
-                event.clone()["params"]["context"]
-                    .as_str()
-                    ?
-                    .to_string()
-            })
+            .map(|event| event.clone()["params"]["context"].as_str()?.to_string())
             .collect::<Vec<_>>();
 
         assert!(initial_events_len == 2);

tests/browsing_context.rs

@@ -1,4 +1,3 @@
-
 // use webdriverbidi::remote::browsing_context::ActivateParameters;
 // use webdriverbidi::remote::script::{ContextTarget, EvaluateParameters, Target};
 
@@ -202,7 +201,6 @@ mod utils;
 //     }
 // }
 
-
 // // async def get_viewport_dimensions(bidi_session, context: str,
 // //       with_scrollbar: bool = True, quirk_mode: bool = False):
 // //     if with_scrollbar:
@@ -247,11 +245,11 @@ mod utils;
 // // https://github.com/web-platform-tests/wpt/tree/master/webdriver/tests/bidi/browsing_context/capture_screenshot
 // mod capture_screenshot {
 //     use super::*;
-   
+
 //     // async def test_capture(bidi_session, top_context, inline, compare_png_bidi,
 //     //                        activate):
 //     //     expected_size = await get_physical_viewport_dimensions(bidi_session, top_context)
-    
+
 //     //     await bidi_session.browsing_context.navigate(
 //     //         context=top_context["context"], url="about:blank", wait="complete"
 //     //     )
@@ -261,7 +259,7 @@ mod utils;
 //     //     reference_data = await bidi_session.browsing_context.capture_screenshot(
 //     //         context=top_context["context"])
 //     //     assert png_dimensions(reference_data) == expected_size
-    
+
 //     //     await bidi_session.browsing_context.navigate(
 //     //         context=top_context["context"], url=inline("<div>foo</div>"), wait="complete"
 //     //     )
@@ -270,10 +268,10 @@ mod utils;
 //     //             context=top_context["context"])
 //     //     data = await bidi_session.browsing_context.capture_screenshot(
 //     //         context=top_context["context"])
-    
+
 //     //     comparison = await compare_png_bidi(data, reference_data)
 //     //     assert not comparison.equal()
-    
+
 //     //     # Take a second screenshot that should be identical to validate that
 //     //     # we don't just always return false here
 //     //     await bidi_session.browsing_context.navigate(
@@ -284,58 +282,56 @@ mod utils;
 //     //             context=top_context["context"])
 //     //     new_data = await bidi_session.browsing_context.capture_screenshot(
 //     //         context=top_context["context"])
-    
+
 //     //     comparison = await compare_png_bidi(new_data, data)
 //     //     assert comparison.equal()
-    
-    
+
 //     // @pytest.mark.parametrize("delta_width", [-10, +20], ids=["width smaller", "width larger"])
 //     // @pytest.mark.parametrize("delta_height", [-30, +40], ids=["height smaller", "height larger"])
 //     // @pytest.mark.asyncio
 //     // async def test_capture_with_viewport(bidi_session, new_tab, delta_width, delta_height):
 //     //     original_viewport = await get_viewport_dimensions(bidi_session, new_tab)
-    
+
 //     //     dpr = await get_device_pixel_ratio(bidi_session, new_tab)
-    
+
 //     //     test_viewport = {
 //     //         "width": original_viewport["width"] + delta_width,
 //     //         "height": original_viewport["height"] + delta_height
 //     //     }
 //     //     await bidi_session.browsing_context.set_viewport(
 //     //         context=new_tab["context"],
 //     //         viewport=test_viewport)
-    
+
 //     //     expected_size = {
 //     //         "width": floor(test_viewport["width"] * dpr),
 //     //         "height": floor(test_viewport["height"] * dpr)
 //     //     }
-    
+
 //     //     await bidi_session.browsing_context.navigate(
 //     //         context=new_tab["context"], url="about:blank", wait="complete"
 //     //     )
-    
+
 //     //     result = await bidi_session.browsing_context.capture_screenshot(
 //     //         context=new_tab["context"])
 //     //     assert png_dimensions(result) == (expected_size["width"], expected_size["height"])
-    
-    
+
 //     // @pytest.mark.parametrize("dpr", [0.5, 2])
 //     // @pytest.mark.asyncio
 //     // async def test_capture_with_different_dpr(bidi_session, new_tab, inline, dpr):
 //     //     page = inline("<div style='background-color: black; width: 100px; height: 100px;'></div>")
 //     //     await bidi_session.browsing_context.navigate(
 //     //         context=new_tab["context"], url=page, wait="complete"
 //     //     )
-    
+
 //     //     original_viewport = await get_viewport_dimensions(bidi_session, new_tab)
-    
+
 //     //     await bidi_session.browsing_context.set_viewport(
 //     //         context=new_tab["context"],
 //     //         device_pixel_ratio=dpr)
-    
+
 //     //     expected_width = original_viewport["width"] * dpr
 //     //     expected_height = original_viewport["height"] * dpr
-    
+
 //     //     data = await bidi_session.browsing_context.capture_screenshot(context=new_tab["context"])
 //     //     (actual_width, actual_height) = png_dimensions(data)
 //     //     # The rounding is implementation-specific and can be either floor, ceil or round depending on the browser