stuff, and timeline test case

ZoneMinder · Apr 2, 2019 · 8ea0967 · 8ea0967
1 parent cc3f668
commit 8ea0967
Show file tree

Hide file tree

Showing 5 changed files with 9,902 additions and 12 deletions.
diff --git a/config.xml b/config.xml
@@ -169,10 +169,13 @@
     <plugin name="cordova-custom-config" spec="5.0.2" />
     <plugin name="cordova-plugin-advanced-http" spec="git+https://github.com/silkimen/cordova-plugin-advanced-http.git" />
     <plugin name="cordova-plugin-advanced-websocket" spec="1.1.5" />
-    <plugin name="cordova-plugin-photo-library" spec="https://github.com/terikon/cordova-plugin-photo-library.git">
-        <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value="save event images from ZM" />
-    </plugin>
     <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
+    <plugin name="cordova-plugin-photo-library" spec="https://github.com/nilebma/cordova-plugin-photo-library.git">
+        <variable name="PHOTO_LIBRARY_USAGE_DESCRIPTION" value=" " />
+    </plugin>
     <engine name="android" spec="7.1.4" />
     <engine name="ios" spec="4.5.5" />
+    <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git">
+        <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
+    </plugin>
 </widget>
diff --git a/package.json b/package.json
@@ -53,10 +53,13 @@
       },
       "cordova-custom-config": {},
       "cordova-plugin-advanced-websocket": {},
+      "cordova-plugin-media-pp-fork": {},
       "cordova-plugin-photo-library": {
-        "PHOTO_LIBRARY_USAGE_DESCRIPTION": "save event images from ZM"
+        "PHOTO_LIBRARY_USAGE_DESCRIPTION": "Save monitor photos to albums "
       },
-      "cordova-plugin-media-pp-fork": {}
+      "cordova-plugin-ionic-webview": {
+        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
+      }
     }
   },
   "dependencies": {
@@ -81,10 +84,11 @@
     "cordova-plugin-inappbrowser": "^1.7.2",
     "cordova-plugin-insomnia": "^4.3.0",
     "cordova-plugin-ionic-keyboard": "^2.1.3",
+    "cordova-plugin-ionic-webview": "git+https://github.com/pliablepixels/cordova-plugin-ionic-webview.git",
     "cordova-plugin-media-pp-fork": "^1.0.2-dev",
     "cordova-plugin-multi-window": "0.0.3",
     "cordova-plugin-network-information": "^2.0.1",
-    "cordova-plugin-photo-library": "git+https://github.com/terikon/cordova-plugin-photo-library.git",
+    "cordova-plugin-photo-library": "git+https://github.com/nilebma/cordova-plugin-photo-library.git",
     "cordova-plugin-pin-dialog": "^0.1.3",
     "cordova-plugin-splashscreen": "^4.1.0",
     "cordova-plugin-statusbar": "^2.4.2",

diff --git a/tests/testcases/test.py b/tests/testcases/test.py
@@ -20,6 +20,7 @@
 import state
 import events
 import logs
+import timeline
 
 
 class ZmninjaAndroidTests(unittest.TestCase):
@@ -92,6 +93,22 @@ def test_app(self):
         configs = [];
 
         # Add as many as you need
+
+        '''
+        configs.append ({
+            'portal': 'https://zm',
+            'user': 'admin',
+            'password': '',
+            'use_auth': True,
+            'use_zm_auth': True,
+            'use_basic_auth': False,
+            'basic_user': None,
+            'basic_password': None,
+            'screenshot_dir': './screenshots',
+            'restart': False,
+            'prompt': True
+        })
+        '''
 
         configs.append ({
             'portal': 'https://demo.zoneminder.com/zm',
@@ -104,11 +121,11 @@ def test_app(self):
             'basic_password': None,
             'screenshot_dir': './screenshots',
             'restart': False,
-            'prompt': False
+            'prompt': True
         })
 
         configs.append ({
-            'portal': 'https://10.6.1.16/zm',
+            'portal': 'https://10.6.1.32/zm',
             'user': 'admin',
             'password': 'admin',
             'use_auth': True,
@@ -154,9 +171,10 @@ def test_app(self):
             sleep(5)
             wizard.run_tests(self, isFirstRun)
             isFirstRun = False
-            #montage.run_tests(self)
-            #events.run_tests(self)
             logs.run_tests(self)
+            montage.run_tests(self)
+            events.run_tests(self)
+            timeline.run_tests(self)
             if c.testConfig['restart']:
                 state.run_tests(self)
 

diff --git a/tests/testcases/timeline.py b/tests/testcases/timeline.py
@@ -9,7 +9,8 @@
 def run_tests(self):
     app.tap_menu_js()
     c.log ('Validating timeline')
-    _wait_for_id('timeline-ctrl')
-     c.take_screenshot(None, 'view-after-timeline-draw.png')
+    c.click_item('testaut_menu_timeline')
+    c._wait_for_id('timeline-ctrl')
+    c.take_screenshot(None, 'view-after-timeline-draw.png')