robotframework · emanlove · Apr 14, 2024 · Jun 9, 2023 · Nov 11, 2023 · Nov 11, 2023
diff --git a/atest/acceptance/expected_conditions.robot.PROTOTYPE b/atest/acceptance/expected_conditions.robot.PROTOTYPE
@@ -0,0 +1,34 @@
+*** Test Cases ***
+# Wait Until Element State Is (Not)
+# Get Element State
+# Element States Should (Not) Be
+
+Check waiting for condition that takes a element
+   Fail
+
+Check waiting for condition that takes a title
+   Fail
+
+Check waiting for condition that takes a url
+   Fail
+   Wait Until    url contains   google
+   # verify took 2 seconds
+
+Check waiting for condition that takes locator and string
+   Wait Until Element State Is     ${condition}    ${locator}   ${string}
+   Wait Until Element State Is     ${condition}    ${element}
+   Wait Until Condition Is         ${condition}    ${target}
+   Wait Until Condition Is         ${condition}    ${whatelse you need for this condition}
+
+
+   Wait Until State Is         number_of_windows_to_be
+   Wait Until Expected Condition Is         number_of_windows_to_be
+   Wait Until Condition Is     number of windows to be   5
+   Wait Until Condition Is     text to be present in element attribute    //some/xpath/to/an/element  href  http://hello
+
+   Wait Until Condition Is     number of windows to be   5    text to be present in element attribute    //some/xpath/to/an/element  href  http://hello
+
+   Wait Until    number of windows to be   5
+   Wait Until    text to be present in element attribute    //some/xpath/to/an/element  href  http://hello   
+   Get Condition
+   Is       number of windows to be   5
diff --git a/atest/acceptance/keywords/expected_conditions.robot b/atest/acceptance/keywords/expected_conditions.robot
@@ -0,0 +1,21 @@
+*** Settings ***
+Test Setup        Go To Page "javascript/expected_conditions.html"
+Resource          ../resource.robot
+
+*** Test Cases ***
+Wait For Expected Conditions One Argument
+    Title Should Be    Original
+    Click Element    link=delayed change title
+    Wait For Expected Condition    title_is    Delayed
+    Title Should Be    Delayed
+
+Wait For Expected Condition Times out
+    Title Should Be    Original
+    Click Element    link=delayed change title
+    Wait For Expected Condition    title_is    Foo
+    # Verify failure
+
+Wait For Expected Conditions using WebElement as locator
+    Click Button    Change the button state
+    ${dynamic_btn}=  Get WebElement  id:enabledDisabledBtn
+    Wait For Expected Condition  element_to_be_clickable  ${dynamic_btn}
diff --git a/atest/resources/html/javascript/dynamic_content.html b/atest/resources/html/javascript/dynamic_content.html
@@ -10,10 +10,17 @@
 			container = document.getElementById(target_container);
 			container.appendChild(p);
 		}
+
+		function delayed_title_change() {
+			setTimeout(function(){
+				document.title='Delayed';
+			},600);
+		}
 		</script>
 	</head>
 	<body>
 		<a href="javascript:return false;" onclick="document.title='Changed'; return false;">change title</a><br/>
+		<a href="javascript:return false;" onclick="delayed_title_change(); return false;">delayed change title</a><br/>
 		<a href="javascript:return false;" onclick="add_content('target', 'added content'); return false;">add content</a><br/>
 		<a id="unicode" href="javascript:return false;" onclick="document.title='äää'; return false;">title to ääää</a><br/>
 		<p>

diff --git a/atest/resources/html/javascript/expected_conditions.html b/atest/resources/html/javascript/expected_conditions.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+		<title>Original</title>
+		<script type="text/javascript">
+		function add_content(target_container, content) {
+			p = document.createElement('p');
+			p.appendChild(document.createTextNode(content));
+			container = document.getElementById(target_container);
+			container.appendChild(p);
+		}
+
+		function delayed_button_state() {
+			setTimeout(function() {
+				state_btn = document.getElementById('enabledDisabledBtn')
+				if (state_btn.hasAttribute("disabled")) {
+					state_btn.removeAttribute("disabled")
+					state_btn.value = "Enabled"
+				} else {
+					state_btn.setAttribute("disabled", "")
+					state_btn.value = "Disabled"
+				}
+			},900)
+		}
+		function delayed_title_change() {
+			setTimeout(function(){
+				document.title='Delayed';
+			},600);
+		}
+		</script>
+	</head>
+	<body>
+		<a href="javascript:return false;" onclick="document.title='Changed'; return false;">change title</a><br/>
+		<a href="javascript:return false;" onclick="delayed_title_change(); return false;">delayed change title</a><br/>
+		<a href="javascript:return false;" onclick="add_content('target', 'added content'); return false;">add content</a><br/>
+		<a id="unicode" href="javascript:return false;" onclick="document.title='äää'; return false;">title to ääää</a><br/>
+		<p>
+			<input type="radio" name="group" value="title" 
+			onclick="document.title='Changed by Button';" />Change Title<br/>
+			<input type="radio" name="group" value="content" 
+			onclick="add_content('button_target', 'added by button');"/>Add Content<br/>
+        </p>
+        <div id="target">
+		</div>
+		<div id="button_target">
+        </div>
+        <form name=myform>
+            <input type=button value="Change the title" 
+            onClick="if(confirm('Really change the title?'))
+            document.title += ' Changed!';" >
+		</form>
+		<p>
+			<input type=button id=stateChangeBtn value="Change the button state"
+			onClick="delayed_button_state()" />
+			<input type=button id=enabledDisabledBtn value="Disabled"
+			disabled />
+		</p>
+		<p>
+			<form name=titleChanger>
+				<td>
+					<input type=text id=titleChangeTxt value="Enter Title here">
+				</td>
+				<td>
+					<input type=button id=titleChangeBtn value="Set Title" 
+					onClick="document.title = document.getElementById('titleChangeTxt').value;" >
+				</td>
+			</form>
+		</p>
+	</body>
+</html>
+
diff --git a/src/SeleniumLibrary/__init__.py b/src/SeleniumLibrary/__init__.py
@@ -35,6 +35,7 @@
     BrowserManagementKeywords,
     CookieKeywords,
     ElementKeywords,
+    ExpectedConditionKeywords,
     FormElementKeywords,
     FrameKeywords,
     JavaScriptKeywords,
@@ -490,6 +491,7 @@ def __init__(
             BrowserManagementKeywords(self),
             CookieKeywords(self),
             ElementKeywords(self),
+            ExpectedConditionKeywords(self),
             FormElementKeywords(self),
             FrameKeywords(self),
             JavaScriptKeywords(self),

diff --git a/src/SeleniumLibrary/keywords/__init__.py b/src/SeleniumLibrary/keywords/__init__.py
@@ -18,6 +18,7 @@
 from .browsermanagement import BrowserManagementKeywords  # noqa
 from .cookie import CookieKeywords  # noqa
 from .element import ElementKeywords  # noqa
+from .expectedconditions import ExpectedConditionKeywords  # noqa
 from .formelement import FormElementKeywords  # noqa
 from .frames import FrameKeywords  # noqa
 from .javascript import JavaScriptKeywords  # noqa

diff --git a/src/SeleniumLibrary/keywords/expectedconditions.py b/src/SeleniumLibrary/keywords/expectedconditions.py
@@ -0,0 +1,25 @@
+# Copyright 2016-     Robot Framework Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from SeleniumLibrary.base import LibraryComponent, keyword
+from selenium.webdriver.support.wait import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+
+class ExpectedConditionKeywords(LibraryComponent):
+    @keyword
+    def wait_for_expected_condition(self, condition, *args):
+        wait = WebDriverWait(self.driver, 10, 0.1)
+        # import sys,pdb;pdb.Pdb(stdout=sys.__stdout__).set_trace()
+        c = getattr(EC, condition)
+        wait.until(c(*args))
diff --git a/utest/test/api/test_plugins.py b/utest/test/api/test_plugins.py
@@ -22,7 +22,7 @@ def setUpClass(cls):
     def test_no_libraries(self):
         for item in [None, "None", ""]:
             sl = SeleniumLibrary(plugins=item)
-            self.assertEqual(len(sl.get_keyword_names()), 177)
+            self.assertEqual(len(sl.get_keyword_names()), 178)
 
     def test_parse_library(self):
         plugin = "path.to.MyLibrary"