Fix some tests

functional-tests/classes/WAPI/request.py

@@ -90,8 +90,7 @@ def get(self, firm_id):
             'key': self.base_params['key'],
             'id': str(firm_id),
             'type': 'filial',
-            'fields': 'items.reviews,items.photos,\
-                items.links,items.external_content'
+            'fields': 'items.reviews,items.photos,items.links,items.external_content'
         }
         url = "%s%s" % (self.api_url, method)
         return self.request(url, params)
@@ -111,8 +110,10 @@ def get(self, id):
             'key': self.base_params['key'],
             'id': str(id),
             'type': 'filial',
-            'fields': 'items.geometry.selection,items.links,items.adm_div,\
-                items.address,items.floors,items.description'
+            'fields': 'items.geometry.selection,items.links,items.adm_div,items.address,items.floors,items.description'
         }
+        print('!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
+        print(params['fields'])
+        print('!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
         url = "%s%s" % (self.api_url, method)
         return self.request(url, params)

functional-tests/classes/components/map.py

@@ -3,7 +3,6 @@
 from selenium.webdriver.common.keys import Keys
 from component import Component
 from classes.util.scripts import GetScripts
-from classes.util.scripts import WheelScript
 from classes.util.scripts import SetScripts
 from time import time
 import math
@@ -38,11 +37,6 @@ def center_dbclick(self):
         actions.move_to_element_with_offset(self.element, int(center['x']), int(center['y']))
         actions.double_click().perform()
 
-    def wheel_zoom(self, count):
-        self.driver.execute_script(WheelScript.prepare + WheelScript.wheel_levels(count))
-        # :`(
-        sleep(1)
-
     def set_zoom(self, level):
         self.driver.execute_script(SetScripts.set_zoom(level))
 

functional-tests/classes/util/scripts.py

@@ -25,55 +25,3 @@ def open_marker(name='marker'):
     @staticmethod
     def dg_then(cb=''):
         return 'DG.then(%s);' % cb
-
-
-class WheelScript:
-    prepare = """
-        var wheelContainer;
-        var mapX, mapY;
-
-        function wheel(event) {
-            console.log('Start center is ' + map.getCenter());
-            console.log('Start zoom is ' + map.getZoom());
-        }
-
-        function prepareWheel() {
-            wheelContainer = document.getElementById('map');
-            var coord = wheelContainer.getBoundingClientRect();
-            var offsets = map.latLngToContainerPoint(map.getCenter());
-            mapY = coord.top + offsets.y;
-            mapX = coord.left + offsets.x;
-            wheelContainer.addEventListener('DOMMouseScroll', wheel, false);
-        }
-
-        function wheelFire(levels) {
-            var evt = document.createEvent("MouseEvents");
-            evt.initMouseEvent(
-              'DOMMouseScroll', // in DOMString typeArg,
-               true,  // in boolean canBubbleArg,
-               true,  // in boolean cancelableArg,
-               window,// in views::AbstractView viewArg,
-               -levels,   // in long detailArg,
-               0,     // in long screenXArg,
-               0,     // in long screenYArg,
-               mapX,     // in long clientXArg,
-               mapY,     // in long clientYArg,
-               0,     // in boolean ctrlKeyArg,
-               0,     // in boolean altKeyArg,
-               0,     // in boolean shiftKeyArg,
-               0,     // in boolean metaKeyArg,
-               0,     // in unsigned short buttonArg,
-               null   // in EventTarget relatedTargetArg
-            );
-            wheelContainer.dispatchEvent(evt);
-        }
-        prepareWheel()
-    """
-
-    @staticmethod
-    def wheel_levels(count=1):
-        """
-        :param count: scrolling wheel click count
-        :return: string
-        """
-        return 'wheelFire(%s)' % str(count)

functional-tests/tests/firm_callout_test.py

@@ -278,9 +278,8 @@ def firm_website_count_test(self, url, lat, lng, firm_id):
         config.aut['local'] + u'/base.html',
         54.980678320392336,
         82.89860486984254,
-        141265770847007
-    )
-    ])
+        141265771881838
+    )])
     def firm_email_test(self, url, lat, lng, firm_id):
         """
         Проверка наличия email

functional-tests/tests/zoom_test.py

@@ -78,39 +78,3 @@ def zoomIn_shift_select_test(self, url):
         self.page.map.zoom_selection()
         zoom_end = self.page.console(GetScripts.getZoom)
         self.assertEqual(zoom_end - zoom_start, 1)
-
-    @dataprovider([
-        config.aut['local'] + u'/base.html'
-    ])
-    def zoomIn_wheel_test(self, url):
-        """
-        :param url: Адрес страницы
-        Проверка зума скролом вперед
-        1.Получаем зум страницы
-        2.Скролим вперед на одно деление увеличивая зум
-        3.Проверяем изсенение зума
-        """
-        self.driver.get(url)
-        self.page.map.wait_init()
-        zoom_start = self.page.console(GetScripts.getZoom)
-        self.page.map.wheel_zoom(1)
-        zoom_end = self.page.console(GetScripts.getZoom)
-        self.assertEqual(zoom_end - zoom_start, 1)
-
-    @dataprovider([
-        config.aut['local'] + u'/base.html'
-    ])
-    def zoomOut_wheel_test(self, url):
-        """
-        :param url: Адрес страницы
-        Проверка зума скролом назад
-        1.Получаем зум страницы
-        2.Скролим вперед на одно деление уменьшая зум
-        3.Проверяем изсенение зума
-        """
-        self.driver.get(url)
-        self.page.map.wait_init()
-        zoom_start = self.page.console(GetScripts.getZoom)
-        self.page.map.wheel_zoom(-1)
-        zoom_end = self.page.console(GetScripts.getZoom)
-        self.assertEqual(zoom_end - zoom_start, -1)