ENH: Added UserControllerTest.php

Author: Charles Marion

core/AppController.php

@@ -59,7 +59,7 @@ public function preDispatch()
       $modelLoad = new MIDAS_ModelLoader();
       if(Zend_Registry::get('configGlobal')->environment == 'testing' && isset($testingUserId))
         {
-        $user = new Zend_Session_Namespace('Auth_User');
+        $user = new Zend_Session_Namespace('Auth_User_Testing');
         $userModel = $modelLoad->loadModel('User');
         $user->Dao = $userModel->load($testingUserId);
         if($user->Dao == false)
@@ -227,6 +227,10 @@ public function preDispatch()
   /** get server's url */
   function getServerURL()
     {
+    if($this->isTestingEnv())
+      {
+      return 'http://localhost';
+      }
     $currentPort = "";
     $prefix = "http://";
 

core/controllers/UserController.php

@@ -25,11 +25,11 @@ function recoverpasswordAction()
       {
       throw new Zend_Exception('Shouldn\'t be logged in');
       }
-    $this->_helper->layout->disableLayout();
+    $this->disableLayout();
     $email = $this->_getParam('email');
     if(isset($email))
       {
-      $this->_helper->viewRenderer->setNoRender();
+      $this->disableView();
       $user = $this->User->getByEmail($email);
 
        // Check ifthe email is already registered
@@ -76,7 +76,7 @@ function make_seed_recoverpass()
       $text .= "Your new password is: ".$pass."<br>";
       $text .= "<br><br>Generated by MIDAS";
 
-      if(mail("$email", "MIDAS: Password request", "$text", "From: \nReply-To: no-reply\nX-Mailer: PHP/" . phpversion()."\nMIME-Version: 1.0\nContent-type: text/html; charset = iso-8859-1"))
+      if($this->isTestingEnv() || mail("$email", "MIDAS: Password request", "$text", "From: \nReply-To: no-reply\nX-Mailer: PHP/" . phpversion()."\nMIME-Version: 1.0\nContent-type: text/html; charset = iso-8859-1"))
         {
         $this->User->save($user);
         echo JsonComponent::encode(array(true, $this->t('An Email has been sent to').' '.$email));
@@ -115,7 +115,7 @@ function registerAction()
       $this->_redirect("/");
       }
     $this->view->form = $this->getFormAsArray($form);
-    $this->_helper->layout->disableLayout();
+    $this->disableLayout();
     $this->view->jsonRegister = JsonComponent::encode(array(
       'MessageNotValid' => $this->t('The e-mail is not valid'), 'MessageNotAvailable' => $this->t('This e-mail is not available'), 'MessagePassword' => $this->t('Password too short'), 'MessagePasswords' => $this->t('The passwords are not the same'), 'MessageLastname' => $this->t('Please set your lastname'), 'MessageTerms' => $this->t('Please validate the terms of service'), 'MessageFirstname' => $this->t('Please set your firstname')
     ));
@@ -128,7 +128,7 @@ function loginAction()
     $this->Form->User->uri = $this->getRequest()->getRequestUri();
     $form = $this->Form->User->createLoginForm();
     $this->view->form = $this->getFormAsArray($form);
-    $this->_helper->layout->disableLayout();
+    $this->disableLayout();
     if($this->_request->isPost())
       {
       $this->_helper->viewRenderer->setNoRender();
@@ -152,14 +152,21 @@ function loginAction()
         $passwordPrefix = Zend_Registry::get('configGlobal')->password->prefix;
         if($authLdap || $userDao != false && md5($passwordPrefix.$form->getValue('password')) == $userDao->getPassword())
           {
+          
           $remember = $form->getValue('remerberMe');
           if(isset($remember) && $remember == 1)
             {
-            setcookie('midasUtil', $userDao->getKey().'-'.md5($userDao->getPassword()), time() + 60 * 60 * 24 * 30, '/'); //30 days
+            if(!$this->isTestingEnv())
+              {
+              setcookie('midasUtil', $userDao->getKey().'-'.md5($userDao->getPassword()), time() + 60 * 60 * 24 * 30, '/'); //30 days
+              }
             }
           else
             {
-            setcookie('midasUtil', null, time() + 60 * 60 * 24 * 30, '/'); //30 days
+            if(!$this->isTestingEnv())
+              {
+              setcookie('midasUtil', null, time() + 60 * 60 * 24 * 30, '/'); //30 days
+              }
             }
           Zend_Session::start();  
           $user = new Zend_Session_Namespace('Auth_User');
@@ -168,6 +175,12 @@ function loginAction()
           $url = $form->getValue('url');
           $user->lock();
           $this->getLogger()->info(__METHOD__ . " Log in : " . $userDao->getFullName());
+          if($this->isTestingEnv())
+            {
+            echo 'Test Pass';
+            $this->disableView();
+            return;
+            }
           }
         }
 
@@ -196,13 +209,13 @@ public function termofserviceAction()
   /** valid  entries (ajax)*/
   public function validentryAction()
     {
-    if(!$this->getRequest()->isXmlHttpRequest())
+    if(!$this->getRequest()->isXmlHttpRequest() && !$this->isTestingEnv())
       {
       throw new Zend_Exception("Why are you here? Should be ajax.");
       }
 
-    $this->_helper->layout->disableLayout();
-    $this->_helper->viewRenderer->setNoRender();
+    $this->disableLayout();
+    $this->disableView();
     $entry = $this->_getParam("entry");
     $type = $this->_getParam("type");
     if(!is_string($entry) || !is_string($type))
@@ -255,10 +268,10 @@ public function settingsAction()
     {
     if(!$this->logged)
       {
-      $this->_helper->viewRenderer->setNoRender();
+      $this->disableView();
       return false;
       }   
-    $this->_helper->layout->disableLayout();
+    $this->disableLayout();
 
     $userId = $this->_getParam('userId');
     if(isset($userId) && $userId != $this->userSession->Dao->getKey() && !$this->userSession->Dao->isAdmin())
@@ -345,10 +358,21 @@ public function settingsAction()
         }
       if(isset($modifyPicture) && $this->logged)
         {
-        $upload = new Zend_File_Transfer();
-        $upload->receive();
-        $path = $upload->getFileName();
-        if(!empty($path) && file_exists($path) && $upload->getFileSize() > 0)
+        if($this->isTestingEnv())
+          {
+          //simulate file upload
+          $path = BASE_PATH.'/tests/testfiles/search.png';
+          $size = filesize($path);
+          }
+        else
+          {
+          $upload = new Zend_File_Transfer();
+          $upload->receive();
+          $path = $upload->getFileName();
+          $size =  $upload->getFileSize();
+          }
+          
+        if(!empty($path) && file_exists($path) && $size > 0)
           {
           //create thumbnail
           $thumbnailCreator = $this->Component->Filter->getFilter('ThumbnailCreator');

core/models/base/GroupModelBase.php

@@ -23,6 +23,25 @@ abstract function addUser($group, $user);
   abstract function removeUser($group, $user);
   abstract function findByCommunity($communityDao);
   abstract function getGroupFromSearch($search, $limit = 14);
+  
+  /** load */
+  public function load($key = null)
+    {
+    if($key == MIDAS_GROUP_ANONYMOUS_KEY)
+      {
+      $this->loadDaoClass('GroupDao');
+      $dao = new GroupDao();
+      $dao->setGroupId(MIDAS_GROUP_ANONYMOUS_KEY);
+      $dao->setCommunityId(0);
+      $dao->setName('Anonymous');
+      $dao->saved = true;
+      return $dao;
+      }
+    else
+      {
+      return parent::load($key);
+      }
+    }
 
   /** Delete a group */
   public function deleteGroup($group)

core/views/user/settings.phtml

@@ -109,7 +109,7 @@ echo '<script type="text/javascript" src="' . $this->coreWebroot . '/public/js/u
       echo "<ul>";
       foreach($this->communities as $community)
         {
-        echo "<li><a style='color:white;' href='{$this->webroot}/community/{$community->getKey()}'>{$community->getName()}</a>";
+        echo "<li class='settingsCommunityList'><a style='color:white;' href='{$this->webroot}/community/{$community->getKey()}'>{$community->getName()}</a>";
         echo "<ul>";
         foreach($community->groups as $group)
           {

tests/core/ControllerTestCase.php

@@ -13,6 +13,11 @@ public function setUp()
     parent::setUp();
     }
 
+    
+  public function getBody()
+    {
+    return $this->response->outputBody();
+    }
       /**
      * @return PHPUnit_Extensions_Database_DataSet_IDataSet
      */
@@ -100,9 +105,16 @@ public function dispatchUrI($uri, $userDao = null, $withException = false){
      {
      $this->params['testingUserId'] = $userDao->getKey();
      }
-     
-   $this->request->setQuery($this->params);
+   if($this->request->isPost())
+     {
+     $this->request->setPost($this->params);
+     }
+   else
+     {
+     $this->request->setQuery($this->params);
+     }
    $this->dispatch($uri);
+   $this->assertNotResponseCode('404');
    if($this->request->getControllerName()=="error")
      {
      if($withException)

tests/core/controllers/CMakeLists.txt

@@ -1,5 +1,6 @@
 add_midas_test( IndexController IndexControllerTest.php )
 add_midas_test( FeedController FeedControllerTest.php )
+add_midas_test( UserController UserControllerTest.php )
 
 
 # Syle