A bug in config of elfinder is fixed. (It caused an error while runni…

…ng panel tests)
serverfireteam · Sep 9, 2015 · 81d7f9b · 81d7f9b
1 parent 29a7b24
commit 81d7f9b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/src/Serverfireteam/Panel/config/elfinder.php b/src/Serverfireteam/Panel/config/elfinder.php
@@ -1,16 +1,6 @@
 <?php
 
-function validName($name) {
-	return strpos($name, '.') !== 0;
-}
-
-function access($attr, $path, $data, $volume) {
-	if (strpos(basename($path), '.') === 0) {
-	        return !($attr == 'read');
-	} else {
-	        return null;
-	}
-}
+use \Serverfireteam\Panel\libs\AppHelper;
 
 return array(
 

diff --git a/src/Serverfireteam/Panel/libs/AppHelper.php b/src/Serverfireteam/Panel/libs/AppHelper.php
@@ -13,4 +13,16 @@ class AppHelper {
     public function getNameSpace(){
         return $this->getAppNamespace();
     }
-}
+
+    public static function validName($name) {
+	return strpos($name, '.') !== 0;
+    }
+
+    public static function access($attr, $path, $data, $volume) {
+	if (strpos(basename($path), '.') === 0) {
+	        return !($attr == 'read');
+	} else {
+	        return null;
+	}
+    }
+}
diff --git a/tests/ResetPasswordTest.php b/tests/ResetPasswordTest.php
@@ -14,7 +14,7 @@ public function test_reset_password()
 		     ->type('12345', 'password')
 		     ->press('Login')
 		     ->see('Dashboard')
-		     ->click('Reset Password')
+		     ->click('Change Password')
 		     ->type('admin@change.me', 'email')
 		     ->type('ooooo', 'current_password')
 		     ->type('pppppp', 'password')
@@ -27,7 +27,7 @@ public function test_reset_password()
 		     ->type('12345', 'password')
 		     ->press('Login')
 		     ->see('Dashboard')
-		     ->click('Reset Password')
+		     ->click('Change Password')
 		     ->type('admin@change.me', 'email')
 		     ->type('12345', 'current_password')
 		     ->type('pppppp', 'password')
@@ -40,7 +40,7 @@ public function test_reset_password()
 		     ->type('12345', 'password')
 		     ->press('Login')
 		     ->see('Dashboard')
-		     ->click('Reset Password')
+		     ->click('Change Password')
 		     ->type('admin@change.me', 'email')
 		     ->type('12345', 'current_password')
 		     ->type('pppppp', 'password')