Merge pull request #154 from seleniumbase/minor-updates

Minor updates

Author: mdmintz

README.md

@@ -88,24 +88,22 @@ cd SeleniumBase
 
 If you're installing SeleniumBase from a cloned copy on your machine, use:
 ```
-pip install -r requirements.txt
+pip install -U -r requirements.txt
 
 python setup.py develop
 ```
 
 If you're installing SeleniumBase from the [Python Package Index](https://pypi.python.org/pypi/seleniumbase), use:
 ```bash
-pip install seleniumbase
+pip install -U seleniumbase
 ```
 
 If you're installing SeleniumBase directly from GitHub, use:
 ```bash
-pip install -e git+https://github.com/seleniumbase/SeleniumBase.git@master#egg=seleniumbase
+pip install -U -e git+https://github.com/seleniumbase/SeleniumBase.git@master#egg=seleniumbase
 ```
 
-(If you already have an older version installed, you may want to add ``--upgrade`` to your ``pip`` command to update existing Python packages. If you're not using a virtual environment, you may need to add ``--user`` to your ``pip`` command if you're getting errors during installation.)
-
-(If you want to use Python 3.x instead of Python 2.7, use ``pip3`` in place of ``pip`` and ``python3`` in place of ``python``.)
+(If you encounter permission errors during installation while not using a virtual environment, you may need to add ``--user`` to your ``pip`` command.)
 
 
 <a id="seleniumbase_basic_usage"></a>

seleniumbase/fixtures/base_case.py

@@ -698,8 +698,8 @@ def activate_jquery(self):
             '''script.src = "http://code.jquery.com/jquery-3.2.1.min.js"; '''
             '''document.getElementsByTagName("head")[0]'''
             '''.appendChild(script);''')
-        for x in range(30):
-            # jQuery needs a small amount of time to activate. (At most 3s)
+        for x in range(int(settings.MINI_TIMEOUT * 10.0)):
+            # jQuery needs a small amount of time to activate.
             try:
                 self.execute_script("jQuery('html')")
                 return
@@ -779,9 +779,12 @@ def highlight(self, selector, by=By.CSS_SELECTOR,
         try:
             selector = self.convert_to_css_selector(selector, by=by)
         except Exception:
-            # Don't highlight if can't convert to CSS_SELECTOR for jQuery
+            # Don't highlight if can't convert to CSS_SELECTOR
             return
-        selector = self._make_css_match_first_element_only(selector)
+
+        if self.highlights:
+            loops = self.highlights
+        loops = int(loops)
 
         o_bs = ''  # original_box_shadow
         style = element.get_attribute('style')
@@ -792,13 +795,66 @@ def highlight(self, selector, by=By.CSS_SELECTOR,
                 original_box_shadow = style[box_start:box_end]
                 o_bs = original_box_shadow
 
+        if ":contains" not in selector and ":first" not in selector:
+            selector = self.jq_format(selector)
+            self.__highlight_with_js(selector, loops, scroll, o_bs)
+        else:
+            selector = self._make_css_match_first_element_only(selector)
+            selector = self.jq_format(selector)
+            try:
+                self.__highlight_with_jquery(selector, loops, scroll, o_bs)
+            except Exception:
+                pass  # JQuery probably couldn't load. Skip highlighting.
+        time.sleep(0.065)
+
+    def __highlight_with_js(self, selector, loops, scroll, o_bs):
+        script = ("""document.querySelector('%s').style =
+                  'box-shadow: 0px 0px 6px 6px rgba(128, 128, 128, 0.5)';"""
+                  % selector)
+        self.execute_script(script)
+
+        for n in range(loops):
+            script = ("""document.querySelector('%s').style =
+                      'box-shadow: 0px 0px 6px 6px rgba(255, 0, 0, 1)';"""
+                      % selector)
+            self.execute_script(script)
+            time.sleep(0.02)
+            script = ("""document.querySelector('%s').style =
+                      'box-shadow: 0px 0px 6px 6px rgba(128, 0, 128, 1)';"""
+                      % selector)
+            self.execute_script(script)
+            time.sleep(0.02)
+            script = ("""document.querySelector('%s').style =
+                      'box-shadow: 0px 0px 6px 6px rgba(0, 0, 255, 1)';"""
+                      % selector)
+            self.execute_script(script)
+            time.sleep(0.02)
+            script = ("""document.querySelector('%s').style =
+                      'box-shadow: 0px 0px 6px 6px rgba(0, 255, 0, 1)';"""
+                      % selector)
+            self.execute_script(script)
+            time.sleep(0.02)
+            script = ("""document.querySelector('%s').style =
+                      'box-shadow: 0px 0px 6px 6px rgba(128, 128, 0, 1)';"""
+                      % selector)
+            self.execute_script(script)
+            time.sleep(0.02)
+            script = ("""document.querySelector('%s').style =
+                      'box-shadow: 0px 0px 6px 6px rgba(128, 0, 128, 1)';"""
+                      % selector)
+            self.execute_script(script)
+            time.sleep(0.02)
+
+        script = ("""document.querySelector('%s').style =
+                  'box-shadow: %s';"""
+                  % (selector, o_bs))
+        self.execute_script(script)
+
+    def __highlight_with_jquery(self, selector, loops, scroll, o_bs):
         script = """jQuery('%s').css('box-shadow',
             '0px 0px 6px 6px rgba(128, 128, 128, 0.5)');""" % selector
         self.safe_execute_script(script)
 
-        if self.highlights:
-            loops = self.highlights
-        loops = int(loops)
         for n in range(loops):
             script = """jQuery('%s').css('box-shadow',
                 '0px 0px 6px 6px rgba(255, 0, 0, 1)');""" % selector
@@ -827,7 +883,6 @@ def highlight(self, selector, by=By.CSS_SELECTOR,
 
         script = """jQuery('%s').css('box-shadow', '%s');""" % (selector, o_bs)
         self.execute_script(script)
-        time.sleep(0.065)
 
     def scroll_to(self, selector, by=By.CSS_SELECTOR,
                   timeout=settings.SMALL_TIMEOUT):
@@ -1376,7 +1431,7 @@ def wait_for_ready_state_complete(self, timeout=settings.EXTREME_TIMEOUT):
             timeout = self._get_new_timeout(timeout)
         is_ready = page_actions.wait_for_ready_state_complete(self.driver,
                                                               timeout)
-        self.wait_for_angularjs()
+        self.wait_for_angularjs(timeout=settings.MINI_TIMEOUT)
         return is_ready
 
     def wait_for_angularjs(self, timeout=settings.LARGE_TIMEOUT, **kwargs):

setup.py

@@ -7,7 +7,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.8.1',
+    version='1.8.2',
     description='Web Automation & Testing Framework - http://seleniumbase.com',
     long_description='Web Automation and Testing Framework - seleniumbase.com',
     platforms='Mac * Windows * Linux * Docker',