BUG: refs #0352. Fix test so it won't collide with changes in next

midasplatform · Nov 18, 2011 · f42525b · f42525b
1 parent 92209cf
commit f42525b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/controllers/UploadController.php b/core/controllers/UploadController.php
@@ -246,7 +246,7 @@ public function saveuploadedAction()
     if($this->isTestingEnv())
       {
       //simulate file upload
-      $path = $this->_getParam('path');
+      $path = $this->_getParam('testpath');
       $filename = basename($path);
       $file_size = filesize($path);
       }

diff --git a/core/tests/controllers/UploadDownloadControllerTest.php b/core/tests/controllers/UploadDownloadControllerTest.php
@@ -176,7 +176,7 @@ function testSaveuploadedAction()
     $this->params = array();
     $this->params['parent'] = $userDao->getPublicFolder()->getKey();
     $this->params['license'] = 0;
-    $this->params['path'] = BASE_PATH.'/tests/testfiles/search.png'; //testing mode param
+    $this->params['testpath'] = BASE_PATH.'/tests/testfiles/search.png'; //testing mode param
     $this->dispatchUrI('/upload/saveuploaded', $userDao);
 
     $search = $this->Item->getItemsFromSearch('search.png', $userDao);
@@ -186,7 +186,7 @@ function testSaveuploadedAction()
     $this->resetAll();
     $this->params['parent'] = $userDao->getPublicFolder()->getKey();
     $this->params['license'] = 0;
-    $this->params['path'] = BASE_PATH.'/tests/testfiles/empty.txt'; //testing mode param
+    $this->params['testpath'] = BASE_PATH.'/tests/testfiles/empty.txt'; //testing mode param
     $this->dispatchUrI('/upload/saveuploaded', $userDao);
 
     $search = $this->Item->getItemsFromSearch('empty.txt', $userDao);