address comments

Author: Maryam Huntsperger

internal/devtools.py

@@ -1360,28 +1360,28 @@ def type_text(self, string):
                     self.send_character(char)
         except Exception:
             logging.exception('Error running type command')
-    def mouse_press(self, commandOptions):
+    def mouse_press(self, command_options):
         """Press down the mouse"""
         params = {
             'type': 'mousePressed',
-            'x': commandOptions['x'],
-            'y': commandOptions['y'],
-            'button': commandOptions['button'],
-            'clickCount': commandOptions['clickCount']
+            'x': command_options['x'],
+            'y': command_options['y'],
+            'button': command_options['button'],
+            'clickCount': command_options['clickCount']
         }
         self.send_command('Input.dispatchMouseEvent', params)
 
-    def mouse_release(self, commandOptions):
+    def mouse_release(self, command_options):
         """Let up the mouse"""
         self.send_command('Input.dispatchMouseEvent', {
             'type': 'mouseReleased',
-            'x': commandOptions['x'],
-            'y': commandOptions['y'],
-            'button': commandOptions['button'],
-            'clickCount': commandOptions['clickCount']
+            'x': command_options['x'],
+            'y': command_options['y'],
+            'button': command_options['button'],
+            'clickCount': command_options['clickCount']
         })
 
-    def mouseClick(self, params):
+    def mouse_click(self, params):
         """Simulate pressing the mouse"""
         try:
             self.mouse_press(params)

internal/devtools_browser.py

@@ -766,7 +766,7 @@ def process_command(self, command):
             self.devtools.type_text(command['target'])
         elif command['command'] == 'keypress':
             self.devtools.keypress(command['target'])
-        elif command['command'] == 'mouseclick':
+        elif command['command'] == 'mouse_click':
             if 'target' in command:
                 target = command['target']
                 separator = target.find('=')
@@ -775,7 +775,6 @@ def process_command(self, command):
                 if separator >= 0:
                     attribute = target[:separator]
                     attr_value = target[separator + 1:]
-                    mouseclickError = False
                     try:
                         query = "JSON.stringify(document.querySelector('[{0}=\"{1}\"]').getBoundingClientRect())".format(
                             attribute, attr_value)
@@ -791,21 +790,19 @@ def process_command(self, command):
                             clickCount = 2                 
                         elif value is not None:
                             logging.info("Click type is not defined.")
-                            mouseclickError = True
 
                         if 'x' in resp_json and 'y' in resp_json and 'width' in resp_json and 'height' in resp_json:
                             x = int(float(resp_json['x'])) + int(float(resp_json['width']))/2
                             y = int(float(resp_json['y'])) + int(float(resp_json['height']))/2
-                            commandOptions = {}
-                            commandOptions['x'] = x
-                            commandOptions['y'] = y
-                            commandOptions['button'] = button
-                            commandOptions['clickCount'] = clickCount
-                            self.devtools.mouseClick(commandOptions)
+                            command_options = {}
+                            command_options['x'] = x
+                            command_options['y'] = y
+                            command_options['button'] = button
+                            command_options['clickCount'] = clickCount
+                            self.devtools.mouse_click(command_options)
                     except:
-                        self.task['error'] = 'Exception parsing mouseClick arguments.'
+                        self.task['error'] = 'Exception parsing mouse_click arguments.'
                         logging.error(self.task['error'])
-                        mouseclickError = True
         elif command['command'] == 'waitfor':
             try:
                 self.devtools.wait_for_script = command['target'] if command['target'] else None