From 691d22daa420f446d6bb45ba41202c1b7aab161e Mon Sep 17 00:00:00 2001
From: = <=>
Date: Mon, 11 Mar 2019 16:13:08 -0400
Subject: #791 events run
---
tests/testcases/app.py | 1 +
tests/testcases/common.py | 7 +++++++
tests/testcases/events.py | 28 ++++++++++++++++++++++++++++
tests/testcases/montage.py | 1 +
tests/testcases/test.py | 2 ++
www/templates/events-modal.html | 6 +++---
www/templates/events.html | 6 +++---
www/templates/menu.html | 2 +-
8 files changed, 46 insertions(+), 7 deletions(-)
create mode 100644 tests/testcases/events.py
diff --git a/tests/testcases/app.py b/tests/testcases/app.py
index b76f1edd..803751d5 100644
--- a/tests/testcases/app.py
+++ b/tests/testcases/app.py
@@ -13,6 +13,7 @@ def tap_menu_js():
c.log ('Tapping menu')
c.driver.execute_script("angular.element(document.getElementById('testaut-menu-controller')).scope().openMenu();")
+
# bah, in some cases this won't work, when the menu is open,
# there are two left items
# so I'm probably not going to use this
diff --git a/tests/testcases/common.py b/tests/testcases/common.py
index 9eb26dbd..cc3b1cdc 100644
--- a/tests/testcases/common.py
+++ b/tests/testcases/common.py
@@ -124,6 +124,13 @@ def click_item(id=id, save_screenshot=False, save_screenshot_file=None, retry=3)
_goto_element(element)
_click_with_retry(element, retry)
+
+def click_item_js(id=id, save_screenshot=False, save_screenshot_file=None):
+ _wait_for_id(id=id, save_screenshot=save_screenshot,
+ save_screenshot_file=save_screenshot_file)
+ element = driver.find_element_by_id(id)
+ log ("clicking {} using JS".format(id))
+ driver.execute_script("arguments[0].click()", element)
# sleep(wait)
# returns text value of loader
diff --git a/tests/testcases/events.py b/tests/testcases/events.py
new file mode 100644
index 00000000..9709dd3c
--- /dev/null
+++ b/tests/testcases/events.py
@@ -0,0 +1,28 @@
+'''
+Validates Events view
+'''
+
+import common as c
+from time import sleep
+import app
+
+def run_tests(self):
+ app.tap_menu_js()
+ c.log ('Validating events')
+ c.click_item('testaut_menu_events')
+
+ # Can't use click_item (el.click) due to footer button
+ # focus conflict
+ # taking 2nd event - first one goes off in emulator
+ # no idea why
+
+ c.click_item_js('testaut_events_footage_button-1')
+
+ sleep(4)
+ c.take_screenshot(None,'events-playback.png')
+ sleep(1)
+ c.dbl_click_item('testaut_events_playwindow')
+
+
+
+
diff --git a/tests/testcases/montage.py b/tests/testcases/montage.py
index cad1878e..7c7fc8a5 100644
--- a/tests/testcases/montage.py
+++ b/tests/testcases/montage.py
@@ -10,6 +10,7 @@ def run_tests(self):
app.tap_menu_js()
c.log ('Validating montage')
c.click_item('testaut_menu_montage')
+ c.take_screenshot(None, 'montage-view-initial.png')
c.click_item('img-0')
sleep(4)
c.take_screenshot(None,'montage-singleview.png')
diff --git a/tests/testcases/test.py b/tests/testcases/test.py
index 2dd4b6af..b1707f59 100644
--- a/tests/testcases/test.py
+++ b/tests/testcases/test.py
@@ -17,6 +17,7 @@ import wizard
import app
import montage
import state
+import events
class ZmninjaAndroidTests(unittest.TestCase):
@@ -119,6 +120,7 @@ class ZmninjaAndroidTests(unittest.TestCase):
wizard.run_tests(self, isFirstRun)
isFirstRun = False
montage.run_tests(self)
+ events.run_tests(self)
if c.testConfig['restart']:
state.run_tests(self)
diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html
index 09a0ce12..3fe3824b 100644
--- a/www/templates/events-modal.html
+++ b/www/templates/events-modal.html
@@ -34,14 +34,14 @@
- ![]()
-
![]()
@@ -68,7 +68,7 @@
-
-