|
24 | 24 | ; AutoIt Version : v3.3.14.3
|
25 | 25 | ; ==============================================================================
|
26 | 26 | #cs
|
| 27 | + V0.1.0.8 |
| 28 | + - Changed: Improve error handling in _WD_Attach |
| 29 | + - Fixed: Missing "window" in URL for _WD_Window |
| 30 | + - Fixed: Header entry for _WD_Option |
| 31 | + - Added: Reference to Edge driver |
| 32 | + - Fixed: _WD_Window implementation of Maximize, Minimize, Fullscreen, & Screenshot |
| 33 | + - Removed: Normal option from _WD_Window |
| 34 | + - Added: Rect option to _WD_Window |
| 35 | +
|
27 | 36 | V0.1.0.7
|
28 | 37 | - Changed: Add $sOption parameter to _WD_Action
|
29 | 38 | - Changed: Implemented "Actions" command in _WD_Action
|
|
99 | 108 |
|
100 | 109 |
|
101 | 110 | #Region Global Constants
|
102 |
| -Global Const $__WDVERSION = "0.1.0.7" |
| 111 | +Global Const $__WDVERSION = "0.1.0.8" |
103 | 112 |
|
104 | 113 | Global Const $_WD_LOCATOR_ByID = "id"
|
105 | 114 | Global Const $_WD_LOCATOR_ByName = "name"
|
@@ -438,7 +447,7 @@ EndFunc ;==>_WD_Action
|
438 | 447 | ; | Maximize
|
439 | 448 | ; | Minimize
|
440 | 449 | ; | Fullscreen
|
441 |
| -; | Normal |
| 450 | +; | Rect |
442 | 451 | ; | Screemshot
|
443 | 452 | ; | Close
|
444 | 453 | ; | Switch
|
@@ -483,8 +492,29 @@ Func _WD_Window($sSession, $sCommand, $sOption = '')
|
483 | 492 | $sResult = Json_Get($sJSON, "[value]")
|
484 | 493 | EndIf
|
485 | 494 |
|
486 |
| - Case 'maximize', 'minimize', 'fullscreen', 'normal', 'screenshot' |
487 |
| - $sResponse = __WD_Get($_WD_BASE_URL & ":" & $_WD_PORT & "/session/" & $sSession & "/window/" & $sCommand) |
| 495 | + Case 'maximize', 'minimize', 'fullscreen' |
| 496 | + $sResponse = __WD_Post($_WD_BASE_URL & ":" & $_WD_PORT & "/session/" & $sSession & "/window/" & $sCommand, $sOption) |
| 497 | + $iErr = @error |
| 498 | + |
| 499 | + If $iErr = $_WD_ERROR_Success Then |
| 500 | + $sResult = $sResponse |
| 501 | + EndIf |
| 502 | + |
| 503 | + Case 'rect' |
| 504 | + If $sOption = '' Then |
| 505 | + $sResponse = __WD_Get($_WD_BASE_URL & ":" & $_WD_PORT & "/session/" & $sSession & "/window/" & $sCommand) |
| 506 | + Else |
| 507 | + $sResponse = __WD_Post($_WD_BASE_URL & ":" & $_WD_PORT & "/session/" & $sSession & "/window/" & $sCommand, $sOption) |
| 508 | + EndIf |
| 509 | + |
| 510 | + $iErr = @error |
| 511 | + |
| 512 | + If $iErr = $_WD_ERROR_Success Then |
| 513 | + $sResult = $sResponse |
| 514 | + EndIf |
| 515 | + |
| 516 | + Case 'screenshot' |
| 517 | + $sResponse = __WD_Get($_WD_BASE_URL & ":" & $_WD_PORT & "/session/" & $sSession & $sCommand) |
488 | 518 | $iErr = @error
|
489 | 519 |
|
490 | 520 | If $iErr = $_WD_ERROR_Success Then
|
@@ -522,7 +552,7 @@ Func _WD_Window($sSession, $sCommand, $sOption = '')
|
522 | 552 | EndIf
|
523 | 553 |
|
524 | 554 | Case Else
|
525 |
| - Return SetError(__WD_Error($sFuncName, $_WD_ERROR_InvalidDataType, "(Window|Handles|Maximize|Minimize|Fullscreen:Normal|Screenshot|Close|Switch|Frame|Parent) $sCommand=>" & $sCommand), 0, "") |
| 555 | + Return SetError(__WD_Error($sFuncName, $_WD_ERROR_InvalidDataType, "(Window|Handles|Maximize|Minimize|Fullscreen|Rect|Screenshot|Close|Switch|Frame|Parent) $sCommand=>" & $sCommand), 0, "") |
526 | 556 |
|
527 | 557 | EndSwitch
|
528 | 558 |
|
|
0 commit comments