flowproof 0.23.1__tar.gz → 0.23.2__tar.gz

{flowproof-0.23.1 → flowproof-0.23.2}/Cargo.lock

@@ -930,7 +930,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-adapters"
-version = "0.23.1"
+version = "0.23.2"
 dependencies = [
  "anyhow",
  "flowproof-driver",
@@ -949,7 +949,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-agent"
-version = "0.23.1"
+version = "0.23.2"
 dependencies = [
  "chrono",
  "flowproof-driver",
@@ -967,7 +967,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-cli"
-version = "0.23.1"
+version = "0.23.2"
 dependencies = [
  "ab_glyph",
  "chrono",
@@ -992,7 +992,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-driver"
-version = "0.23.1"
+version = "0.23.2"
 dependencies = [
  "calamine",
  "flowproof-trace",
@@ -1008,7 +1008,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-python"
-version = "0.23.1"
+version = "0.23.2"
 dependencies = [
  "flowproof-agent",
  "flowproof-cli",
@@ -1020,7 +1020,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-replay"
-version = "0.23.1"
+version = "0.23.2"
 dependencies = [
  "chrono",
  "flowproof-agent",
@@ -1034,7 +1034,7 @@ dependencies = [
 
 [[package]]
 name = "flowproof-trace"
-version = "0.23.1"
+version = "0.23.2"
 dependencies = [
  "jsonschema",
  "regex",

{flowproof-0.23.1 → flowproof-0.23.2}/Cargo.toml

@@ -22,7 +22,7 @@ members = ["crates/flowproof-driver", "crates/flowproof-trace", "crates/flowproo
 exclude = ["spike/windows-containment"]
 
 [workspace.package]
-version = "0.23.1"
+version = "0.23.2"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/automators-com/flowproof"

{flowproof-0.23.1 → flowproof-0.23.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowproof
-Version: 0.23.1
+Version: 0.23.2
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3

{flowproof-0.23.1 → flowproof-0.23.2}/crates/flowproof-adapters/src/web.rs

@@ -133,6 +133,15 @@ fn scroll_element_into_view(element: &headless_chrome::Element<'_>) -> anyhow::R
     anyhow::bail!("SAP grid cell did not enter the viewport after scrolling")
 }
 
+/// Element::click performs its own native scroll, even after an actionability
+/// check. Keep all click paths (including the click before typing) on the same
+/// scrollbar-aware path as double-click and explicit scrolling.
+fn click_element(element: &headless_chrome::Element<'_>) -> anyhow::Result<()> {
+    scroll_element_into_view(element)?;
+    element.parent.click_point(element.get_midpoint()?)?;
+    Ok(())
+}
+
 /// Read a checkbox-like control's state from an element that may be the
 /// control itself OR a wrapper around it. Covers the three shapes real apps
 /// use: a native `input[type=checkbox|radio]`, an ARIA widget carrying
@@ -3188,7 +3197,7 @@ impl AppDriver for WebAppDriver {
             // and clicking a zero-sized input does nothing - so the helper
             // hands back whichever ancestor is actually clickable.
             self.with_element(&locator, &format!("clicking [{selector}]"), |element| {
-                element.click().map(|_| ())
+                click_element(element)
             })?;
         }
         // Verify it took: a click that lands on a disabled or intercepted
@@ -3586,11 +3595,34 @@ impl AppDriver for WebAppDriver {
                 match to {
                     // Bring an in-DOM element into the viewport.
                     ScrollTo::IntoView => {
+                        let sap = self
+                            .tab()?
+                            .evaluate(
+                                "!!document.querySelector('#webguiPage0, #webguiform0')",
+                                false,
+                            )
+                            .map_err(|e| web_err("checking the scroll surface", e))?
+                            .value
+                            .and_then(|v| v.as_bool())
+                            .unwrap_or(false);
+                        if sap {
+                            self.scene()?;
+                        }
+                        self.with_element(
+                            &locator,
+                            "scrolling the target",
+                            scroll_element_into_view,
+                        )?;
+                        // SAP may replace the table after scrolling/validation.
+                        // Settle that response and inspect a freshly resolved
+                        // element, not the detached pre-scroll handle.
+                        if sap {
+                            self.scene()?;
+                        }
                         let value = self.with_element(
                             &locator,
                             &format!("scrolling [{sel}] into view"),
                             |element| {
-                                scroll_element_into_view(element)?;
                                 element.call_js_fn(
                                     r#"function() {
                                         const r = this.getBoundingClientRect();
@@ -3872,7 +3904,7 @@ impl AppDriver for WebAppDriver {
         }
         let locator = Self::locator(selector)?;
         self.with_element(&locator, &format!("clicking [{selector}]"), |element| {
-            element.click().map(|_| ())
+            click_element(element)
         })
     }
 
@@ -4354,6 +4386,12 @@ impl AppDriver for WebAppDriver {
                  value, then by visible text; nothing was selected"
             )));
         }
+        if status == "sap_input" {
+            // Focusing a WebGUI editor can replace it asynchronously. Finish
+            // that transition before selecting/typing, then resolve it again.
+            self.with_element(&locator, "focusing the SAP editor", click_element)?;
+            self.scene()?;
+        }
         self.with_element(&locator, &format!("typing into [{selector}]"), |element| {
             // Select what the field holds before the keystrokes land: typing
             // over a selection replaces, so the field ends up reading `text`
@@ -4369,7 +4407,11 @@ impl AppDriver for WebAppDriver {
             // `type_into`, which clicks again and would collapse the
             // selection back to a caret - the keystrokes would append, which
             // is the accident this contract removes.
-            element.click()?;
+            if status == "sap_input" {
+                element.call_js_fn("function() { this.focus(); }", vec![], false)?;
+            } else {
+                click_element(element)?;
+            }
             element
                 .call_js_fn(
                     r#"function() {

{flowproof-0.23.1 → flowproof-0.23.2}/crates/flowproof-cli/tests/web_e2e.rs

@@ -3112,6 +3112,7 @@ fn top_level_sap_fields_commit_before_recording_and_replay_continue() {
         onkeydown="if(event.key==='Enter') document.getElementById('command').textContent='Command invoked'">
       <div id="command"></div>
       <label for="plant">Plant</label><input id="plant" value="OLD"
+        onfocus="if(!window.replaced){window.replaced=true;setTimeout(()=>{const fresh=this.cloneNode(true);fresh.value='OLD';this.replaceWith(fresh);fresh.focus()},25)}"
         onkeydown="if(event.key==='Enter') document.getElementById('validation').textContent='Plant validated'"
         onblur="document.getElementById('accepted').textContent='Committed plant: '+this.value">
       <div id="validation"></div>
@@ -3214,7 +3215,9 @@ fn sap_grid_scrolls_through_its_scrollbar_and_edits_both_ends() {
       <div id="items_hscroll-bar" style="position:relative;width:240px;height:20px;background:#ddd">
         <div id="items_hscroll-hdl" style="position:absolute;left:0;top:0;width:48px;height:20px;background:#777"></div>
       </div><button>Next</button>
+      <button onclick="replaceAfterScroll=true">Refresh on next scroll</button>
     </div><script>
+      let replaceAfterScroll=false;
       const pane=document.getElementById('items-mrss-cont-none'),thumb=document.getElementById('items_hscroll-hdl');
       let start=null,offset=0;
       thumb.onmousedown=e=>{start={x:e.clientX,offset};e.preventDefault()};
@@ -3225,12 +3228,18 @@ fn sap_grid_scrolls_through_its_scrollbar_and_edits_both_ends() {
         document.getElementById('shift').style.left=(-offset)+'px';
         document.getElementById('header').style.left=(-offset)+'px';
       });
-      window.addEventListener('mouseup',()=>start=null);
+      window.addEventListener('mouseup',()=>{
+        const dragged=!!start;start=null;
+        if(dragged && replaceAfterScroll){
+          replaceAfterScroll=false;
+          setTimeout(()=>pane.replaceWith(pane.cloneNode(true)),10);
+        }
+      });
       function edit(cell,id,label){
         // Native scrollIntoView moves the clipped body, not the grid's model.
         // Such a click cannot activate the intended editor.
         if(pane.scrollLeft!==0)return;
-        if(!document.getElementById(id))cell.innerHTML='<label for="'+id+'">'+label+'</label><input id="'+id+'" style="width:80px">';
+        if(!document.getElementById(id))cell.innerHTML='<label for="'+id+'">'+label+'</label><input id="'+id+'" style="width:200px" oninput="if(pane.scrollLeft!==0)this.value=String()">';
       }
     </script>"#).expect("parse or write browser fixture");
     let spec = FlowSpec::parse(&format!(
@@ -3244,7 +3253,11 @@ steps:
   - Double-click "css:#material-cell"
   - Type 3306 into the "Material" field
   - assert: the "Material" field contains 3306
+  - Click "Plant"
   - assert: the "Plant" field contains 1010
+  - Click "Refresh on next scroll"
+  - Scroll "css:#material-cell" into view
+  - assert: the "Material" field contains 3306
 "#,
         page.display()
     ))

{flowproof-0.23.1 → flowproof-0.23.2}/flowproof/__init__.py

@@ -24,7 +24,7 @@ from flowproof.flow import (
     run,
 )
 
-__version__ = "0.23.1"
+__version__ = "0.23.2"
 
 __all__ = [
     "ClarificationNeeded",

{flowproof-0.23.1 → flowproof-0.23.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "flowproof"
-version = "0.23.1"
+version = "0.23.2"
 description = "Test that a bot only ever does the job it was given — and never deletes, sends or approves the thing it must not. Record it doing the job once, then replay on every commit with zero LLM calls. For the agents and RPA already running real work in production: web, desktop, SAP, Citrix."
 readme = "README.md"
 license = "Apache-2.0"