loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

apptest

Browse source
This commit is contained in:
Yoggzo 2016-02-29 14:21:59 +01:00
commit d0033ae6c5
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/Test/AppTestClass.php
View file

@ -26,8 +26,12 @@ class AppTest{
$this->pluginsApi = plugin_api::getInstance(); $this->pluginsApi = plugin_api::getInstance();
$this->errorClass = new errorManagement($this); $this->errorClass = new errorManagement($this);
$this->output = array(); $this->output = array();
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
$this->errorClass = new errorManagement($this); $this->errorClass = new errorManagement($this);
=======
$this->postParams = $_POST;
>>>>>>> develop
======= =======
$this->postParams = $_POST; $this->postParams = $_POST;
>>>>>>> develop >>>>>>> develop
@ -105,6 +109,7 @@ class AppTest{
return json_encode($this->output); return json_encode($this->output);
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
public function getErrorInstance(){ public function getErrorInstance(){
@ -115,3 +120,6 @@ class AppTest{
======= =======
} }
>>>>>>> develop >>>>>>> develop
=======
}
>>>>>>> develop