Merge pull request #633 from seleniumbase/drag-and-drop

Add a drag_and_drop() method

Author: mdmintz

examples/test_drag_and_drop.py

@@ -0,0 +1,19 @@
+"""
+Testing Drag & Drop
+"""
+
+from seleniumbase import BaseCase
+
+
+class DragAndDropTests(BaseCase):
+
+    def test_drag_and_drop(self):
+        self.open('https://www.w3schools.com/html/html5_draganddrop.asp')
+        self.remove_elements("script")  # Ad content slows down the page
+        self.remove_elements("iframe")  # Ad content slows down the page
+        self.scroll_to("#div1")
+        self.sleep(0.5)
+        self.assert_false(self.is_element_visible("#div2 img#drag1"))
+        self.drag_and_drop("#div1 img#drag1", '#div2')
+        self.assert_true(self.is_element_visible("#div2 img#drag1"))
+        self.sleep(1)

help_docs/method_summary.md

@@ -123,6 +123,10 @@ self.hover_and_double_click(hover_selector, click_selector,
                             hover_by=By.CSS_SELECTOR, click_by=By.CSS_SELECTOR,
                             timeout=None)
 
+self.drag_and_drop(drag_selector, drop_selector,
+                   drag_by=By.CSS_SELECTOR, drop_by=By.CSS_SELECTOR,
+                   timeout=None)
+
 self.select_option_by_text(dropdown_selector, option,
                            dropdown_by=By.CSS_SELECTOR,
                            timeout=None)

requirements.txt

@@ -32,7 +32,7 @@ parameterized==0.7.4
 soupsieve==1.9.6;python_version<"3.5"
 soupsieve==2.0.1;python_version>="3.5"
 beautifulsoup4==4.9.1
-cryptography==2.9.2
+cryptography==3.0
 pyopenssl==19.1.0
 pygments==2.5.2;python_version<"3.5"
 pygments==2.6.1;python_version>="3.5"
@@ -51,4 +51,4 @@ pyflakes==2.2.0;python_version>="3.5"
 certifi>=2020.6.20
 allure-pytest==2.8.16
 pdfminer.six==20191110;python_version<"3.5"
-pdfminer.six==20200517;python_version>="3.5"
+pdfminer.six==20200720;python_version>="3.5"

seleniumbase/config/ad_block_list.py

@@ -17,17 +17,17 @@
 """
 
 AD_BLOCK_LIST = [
-    'script[src*="/adservice."]',
-    'script[src*="doubleclick.net"]',
-    'script[src*="googletagservices.com"]',
-    'script[src*="doubleclick.net"]',
-    'script[src*="adsbygoogle.js"]',
-    'script[src*="adroll.com"]',
-    'script[src*="/pagead/"]',
-    'script[src*="ads-host"]',
-    'script[src*="adsystem.com"]',
-    'script[type="data-doubleclick"]',
+    '[src*="/adservice."]',
+    '[src*="doubleclick.net"]',
+    '[src*="googletagservices.com"]',
+    '[src*="adsbygoogle.js"]',
+    '[src*="adroll.com"]',
+    '[src*="/pagead/"]',
+    '[type="data-doubleclick"]',
+    'iframe[data-google-container-id]',
     'iframe[src*="doubleclick.net"]',
+    'iframe[src*="/AdServer/"]',
+    'iframe[src*="openx.net"]',
     'iframe[onload*="doWithAds"]',
     'iframe[id*="google_ads_frame"]',
     '[aria-label="Ad"]',

seleniumbase/config/proxy_list.py

@@ -20,10 +20,8 @@
 """
 
 PROXY_LIST = {
-    "example1": "104.154.143.77:3128",  # (Example) - set your own proxy here
+    "example1": "82.200.233.4:3128",  # (Example) - set your own proxy here
     "example2": "105.112.8.53:3128",  # (Example) - set your own proxy here
-    "example3": "82.200.233.4:3128",  # (Example) - set your own proxy here
-    "example4": "176.53.40.222:3128",  # (Example) - set your own proxy here
     "proxy1": None,
     "proxy2": None,
     "proxy3": None,

seleniumbase/core/browser_launcher.py

@@ -175,12 +175,22 @@ def _set_chrome_options(
         chrome_options.add_experimental_option(
             "mobileEmulation", emulator_settings)
         chrome_options.add_argument("--enable-sync")
-    if incognito:
-        chrome_options.add_argument("--incognito")
-    elif guest_mode:
-        chrome_options.add_argument("--guest")
-    else:
-        pass
+    if not proxy_auth and not disable_csp and (
+            not extension_zip and not extension_dir):
+        if incognito:
+            # Use Chrome's Incognito Mode
+            # Incognito Mode prevents Chrome extensions from loading,
+            # so if using extensions or a feature that uses extensions,
+            # then Chrome's Incognito mode will be disabled instead.
+            chrome_options.add_argument("--incognito")
+        elif guest_mode:
+            # Use Chrome's Guest Mode
+            # Guest mode prevents Chrome extensions from loading,
+            # so if using extensions or a feature that uses extensions,
+            # then Chrome's Guest Mode will be disabled instead.
+            chrome_options.add_argument("--guest")
+        else:
+            pass
     if user_data_dir:
         abs_path = os.path.abspath(user_data_dir)
         chrome_options.add_argument("user-data-dir=%s" % abs_path)

seleniumbase/fixtures/base_case.py

@@ -1256,6 +1256,7 @@ def hover_and_double_click(self, hover_selector, click_selector,
             hover_selector, hover_by)
         hover_selector = self.convert_to_css_selector(
             hover_selector, hover_by)
+        hover_by = By.CSS_SELECTOR
         click_selector, click_by = self.__recalculate_selector(
             click_selector, click_by)
         dropdown_element = self.wait_for_element_visible(
@@ -1291,6 +1292,41 @@ def hover_and_double_click(self, hover_selector, click_selector,
             self.__slow_mode_pause_if_active()
         return element
 
+    def drag_and_drop(self, drag_selector, drop_selector,
+                      drag_by=By.CSS_SELECTOR, drop_by=By.CSS_SELECTOR,
+                      timeout=None):
+        """ Drag and drop an element from one selector to another. """
+        if not timeout:
+            timeout = settings.SMALL_TIMEOUT
+        if self.timeout_multiplier and timeout == settings.SMALL_TIMEOUT:
+            timeout = self.__get_new_timeout(timeout)
+        drag_selector, drag_by = self.__recalculate_selector(
+            drag_selector, drag_by)
+        drop_selector, drop_by = self.__recalculate_selector(
+            drop_selector, drop_by)
+        drag_element = self.wait_for_element_visible(
+            drag_selector, by=drag_by, timeout=timeout)
+        self.__demo_mode_highlight_if_active(drag_selector, drag_by)
+        self.wait_for_element_visible(
+            drop_selector, by=drop_by, timeout=timeout)
+        self.__demo_mode_highlight_if_active(drop_selector, drop_by)
+        self.scroll_to(drag_selector, by=drag_by)
+        drag_selector = self.convert_to_css_selector(
+            drag_selector, drag_by)
+        drop_selector = self.convert_to_css_selector(
+            drop_selector, drop_by)
+        drag_and_drop_script = js_utils.get_drag_and_drop_script()
+        self.safe_execute_script(
+            drag_and_drop_script + (
+                "$('%s').simulateDragDrop("
+                "{dropTarget: "
+                "'%s'});" % (drag_selector, drop_selector)))
+        if self.demo_mode:
+            self.__demo_mode_pause_if_active()
+        elif self.slow_mode:
+            self.__slow_mode_pause_if_active()
+        return drag_element
+
     def __select_option(self, dropdown_selector, option,
                         dropdown_by=By.CSS_SELECTOR, option_by="text",
                         timeout=None):
@@ -2303,7 +2339,6 @@ def remove_elements(self, selector, by=By.CSS_SELECTOR):
 
     def ad_block(self):
         """ Block ads that appear on the current web page. """
-        self.wait_for_ready_state_complete()
         from seleniumbase.config import ad_block_list
         for css_selector in ad_block_list.AD_BLOCK_LIST:
             css_selector = re.escape(css_selector)

seleniumbase/fixtures/js_utils.py

@@ -732,6 +732,64 @@ def slow_scroll_to_element(driver, element, browser):
         time.sleep(0.162)
 
 
+def get_drag_and_drop_script():
+    script = (r"""(function( $ ) {
+        $.fn.simulateDragDrop = function(options) {
+                return this.each(function() {
+                        new $.simulateDragDrop(this, options);
+                });
+        };
+        $.simulateDragDrop = function(elem, options) {
+                this.options = options;
+                this.simulateEvent(elem, options);
+        };
+        $.extend($.simulateDragDrop.prototype, {
+                simulateEvent: function(elem, options) {
+                        /*Simulating drag start*/
+                        var type = 'dragstart';
+                        var event = this.createEvent(type);
+                        this.dispatchEvent(elem, type, event);
+
+                        /*Simulating drop*/
+                        type = 'drop';
+                        var dropEvent = this.createEvent(type, {});
+                        dropEvent.dataTransfer = event.dataTransfer;
+                        this.dispatchEvent(
+                            $(options.dropTarget)[0], type, dropEvent);
+
+                        /*Simulating drag end*/
+                        type = 'dragend';
+                        var dragEndEvent = this.createEvent(type, {});
+                        dragEndEvent.dataTransfer = event.dataTransfer;
+                        this.dispatchEvent(elem, type, dragEndEvent);
+                },
+                createEvent: function(type) {
+                        var event = document.createEvent("CustomEvent");
+                        event.initCustomEvent(type, true, true, null);
+                        event.dataTransfer = {
+                                data: {
+                                },
+                                setData: function(type, val){
+                                        this.data[type] = val;
+                                },
+                                getData: function(type){
+                                        return this.data[type];
+                                }
+                        };
+                        return event;
+                },
+                dispatchEvent: function(elem, type, event) {
+                        if(elem.dispatchEvent) {
+                                elem.dispatchEvent(event);
+                        }else if( elem.fireEvent ) {
+                                elem.fireEvent("on"+type, event);
+                        }
+                }
+        });
+        })(jQuery);""")
+    return script
+
+
 @decorators.deprecated("Use re.escape() instead, which does what you want!")
 def _jq_format(code):
     """

setup.py

@@ -54,7 +54,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.42.15',
+    version='1.43.0',
     description='Fast, Easy, and Reliable Browser Automation & Testing.',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -124,7 +124,7 @@
         'soupsieve==1.9.6;python_version<"3.5"',
         'soupsieve==2.0.1;python_version>="3.5"',
         'beautifulsoup4==4.9.1',
-        'cryptography==2.9.2',
+        'cryptography==3.0',
         'pyopenssl==19.1.0',
         'pygments==2.5.2;python_version<"3.5"',
         'pygments==2.6.1;python_version>="3.5"',
@@ -143,7 +143,7 @@
         'certifi>=2020.6.20',
         'allure-pytest==2.8.16',
         'pdfminer.six==20191110;python_version<"3.5"',
-        'pdfminer.six==20200517;python_version>="3.5"',
+        'pdfminer.six==20200720;python_version>="3.5"',
     ],
     packages=[
         'seleniumbase',