From e88b2c96883639e4d0e36af69862396c9ac8633e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?T=C3=B5nis=20Ormisson?= <tonis@andmemasin.eu>
Date: Mon, 6 Nov 2017 15:29:21 +0200
Subject: [PATCH] add user views

---
 application/views/admin/user/editusers.php          | 2 +-
 application/views/admin/user/modifyuser.php         | 2 +-
 application/views/admin/user/setuserpermissions.php | 5 +++++
 tests/controllers/AdminViewsTest.php                | 7 ++++++-
 tests/data/views/adminUsersViews.php                | 4 ++--
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/application/views/admin/user/editusers.php b/application/views/admin/user/editusers.php
index c1d9000ba10..3994b21ed12 100644
--- a/application/views/admin/user/editusers.php
+++ b/application/views/admin/user/editusers.php
@@ -3,7 +3,7 @@
 /* @var $dataProvider CActiveDataProvider */
 
 // DO NOT REMOVE This is for automated testing to validate we see that page
-echo viewHelper::getViewTestTag('modifyUser');
+echo viewHelper::getViewTestTag('usersIndex');
 
 ?>
 <div class="container-fluid">
diff --git a/application/views/admin/user/modifyuser.php b/application/views/admin/user/modifyuser.php
index 6bfadfcfbc6..faf60b4590f 100644
--- a/application/views/admin/user/modifyuser.php
+++ b/application/views/admin/user/modifyuser.php
@@ -3,7 +3,7 @@
 * @var User $oUser
 */
 // DO NOT REMOVE This is for automated testing to validate we see that page
-echo viewHelper::getViewTestTag('usersIndex');
+echo viewHelper::getViewTestTag('modifyUser');
 ?>
 
 <div class="pagetitle h3">
diff --git a/application/views/admin/user/setuserpermissions.php b/application/views/admin/user/setuserpermissions.php
index 344599da236..235ec709680 100644
--- a/application/views/admin/user/setuserpermissions.php
+++ b/application/views/admin/user/setuserpermissions.php
@@ -1,7 +1,12 @@
 <?php
 /**
+ * @var $this AdminController
  * Set user permissions
  */
+
+// DO NOT REMOVE This is for automated testing to validate we see that page
+echo viewHelper::getViewTestTag('setUserPermissions');
+
 ?>
 
 <!-- set user permissions -->
diff --git a/tests/controllers/AdminViewsTest.php b/tests/controllers/AdminViewsTest.php
index 00ad090ca64..727feba02c5 100644
--- a/tests/controllers/AdminViewsTest.php
+++ b/tests/controllers/AdminViewsTest.php
@@ -92,7 +92,12 @@ public function testSettingsViews($name, $view)
      */
     public function testUsersViews($name,$view){
         // use Admin user
-        $view['route'] = ReplaceFields($view['route'],['{UID}'=>1]);
+        $uid = 1;
+        // non-adminuser for some views
+        if(in_array($name,['setUserPermissions','setUserTemplates'])){
+            $uid = 2;
+        }
+        $view['route'] = ReplaceFields($view['route'],['{UID}'=>$uid]);
         $this->findViewTag($name, $view);
     }
 }
diff --git a/tests/data/views/adminUsersViews.php b/tests/data/views/adminUsersViews.php
index 6804be8245b..c7732c30e5f 100644
--- a/tests/data/views/adminUsersViews.php
+++ b/tests/data/views/adminUsersViews.php
@@ -12,6 +12,6 @@
     ['modifyUser', ['route'=>'user/sa/modifyuser/uid/{UID}']],
 
     // needs POST implementation
-    //['modifyUser', ['route'=>'user/sa/setuserpermissions/uid/']],
-    setusertemplates
+    ['setUserPermissions', ['route'=>'user/sa/setuserpermissions/uid/{UID}']],
+    ['setUserTemplates', ['route'=>'user/sa/setusertemplates/uid/{UID}']],
 ];
\ No newline at end of file