BUG: Refs #212. Only admin users allowed on batchmake config page, with tests.

Author: Michael Grauer

core/tests/databaseDataset/default.xml

@@ -47,7 +47,10 @@
 
 	<user user_id="1" firstname="FirstName1" lastname="LastName1"
 		email="user1@user1.com" password="35fd8ba86ba403ffcc00feac5355ad20" creation="2011-01-27 12:09:02"
-		folder_id="1000" publicfolder_id="1001" privatefolder_id="1002" />
+		folder_id="1000" publicfolder_id="1001" privatefolder_id="1002" admin="0" />
+
+	<user user_id="3" firstname="Admin" lastname="User"
+		email="admin@user.com" password="35fd8ba86ba403ffcc00feac5355ad20" creation="2011-01-27 12:09:02" admin="1" />
 
 	<user2group group_id="3000" user_id="1" />
 	<user2group group_id="3002" user_id="1" />

modules/batchmake/controllers/ConfigController.php

@@ -97,6 +97,11 @@ protected function createDefaultConfig($currentConfig)
    */
   public function indexAction()
     {
+    if(!$this->logged || !$this->userSession->Dao->getAdmin() == 1)
+      {
+      throw new Zend_Exception("You should be an administrator");
+      }
+
     // get all the properties, not just the batchmake config
     $fullConfig = $this->ModuleComponent->KWBatchmake->loadConfigProperties(null, false);
     // now get just the batchmake ones

modules/batchmake/tests/controllers/ConfigControllerTest.php

@@ -25,6 +25,7 @@ class ConfigControllerTest extends BatchmakeControllerTest
   public function setUp()
     {
     $this->setupDatabase(array('default'));
+    $this->_daos = array('User');
     $this->_models = array('User');
     $this->enabledModules = array('batchmake');
     parent::setUp();
@@ -37,10 +38,43 @@ public function setUp()
 
 
 
+
   /** test index action*/
   public function testIndexAction()
     {
-    $this->dispatchUrI("/batchmake/config/index");
+    // first try to bring up the page without logging in, should get an exception
+    $usersFile = $this->loadData('User', 'default');
+    $nullUserDao = null;
+    foreach($usersFile as $userDao)
+      {
+      if($userDao->getFirstname() === 'Admin')
+        {
+        $adminUserDao = $userDao;
+        }
+      else if($userDao->getFirstname() === 'FirstName1')
+        {
+        $nonAdminUserDao = $userDao;
+        }
+      }
+
+    $withException = true;
+    $page = '/batchmake/config/index';
+    $this->params = array();
+    $this->getRequest()->setMethod('GET');
+    $this->dispatchUrI($page, $nullUserDao, $withException);
+
+    // now login with a non-admin account, should get an exception
+    $this->resetAll();
+    $this->params = array();
+    $this->getRequest()->setMethod('GET');
+    $this->dispatchUrI($page, $nonAdminUserDao, $withException);
+
+    // now login with an admin account
+    $this->resetAll();
+    $this->params = array();
+    $this->getRequest()->setMethod('GET');
+    $this->dispatchUrI($page, $adminUserDao);
+
     $body = $this->getBody();
 
     $this->assertModule("batchmake");
@@ -52,20 +86,6 @@ public function testIndexAction()
       }
 
     $this->assertQuery("form#configForm");
-    $applicationConfig = $this->setupAndGetConfig();
-    $this->params = array();
-    $this->params[MIDAS_BATCHMAKE_TMP_DIR_PROPERTY] = $applicationConfig[MIDAS_BATCHMAKE_TMP_DIR_PROPERTY];
-    $this->params[MIDAS_BATCHMAKE_BIN_DIR_PROPERTY] = $applicationConfig[MIDAS_BATCHMAKE_BIN_DIR_PROPERTY];
-    $this->params[MIDAS_BATCHMAKE_SCRIPT_DIR_PROPERTY] = $applicationConfig[MIDAS_BATCHMAKE_SCRIPT_DIR_PROPERTY];
-    $this->params[MIDAS_BATCHMAKE_APP_DIR_PROPERTY] = $applicationConfig[MIDAS_BATCHMAKE_APP_DIR_PROPERTY];
-    $this->params[MIDAS_BATCHMAKE_DATA_DIR_PROPERTY] = $applicationConfig[MIDAS_BATCHMAKE_DATA_DIR_PROPERTY];
-    $this->params[MIDAS_BATCHMAKE_CONDOR_BIN_DIR_PROPERTY] = $applicationConfig[MIDAS_BATCHMAKE_CONDOR_BIN_DIR_PROPERTY];
-    // @TODO get these tests to a better state, testing more
-    // luckily, almost all of the functionality goes through KWBatchmakeComponent
-    // which is reasonably well tested
-    $this->params['submit'] = 'submitConfig';
-    $this->request->setMethod('POST');
-    $this->dispatchUrI("/batchmake/config", null, true);
     }