Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
TonisOrmisson committed Jan 9, 2018
1 parent 4aa9560 commit 0464548
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tests/TestBaseClass.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public static function setUpBeforeClass()
* @return string
*/
public static function getDataFolder(){
return __DIR__."/resources/data";
return __DIR__."/resources";
}

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/admin/AdminViewsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See COPYRIGHT.php for copyright notices and details.
*/

namespace ls\tests\funtional\admin;
namespace ls\tests\acceptance\admin;

use ls\tests\TestBaseClassView;

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/admin/CreateSurveyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See COPYRIGHT.php for copyright notices and details.
*/

namespace ls\tests\funtional\admin;
namespace ls\tests\acceptance\admin;

use Facebook\WebDriver\WebDriverBy;
use Facebook\WebDriver\WebDriverExpectedCondition;
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/admin/InstallationControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See COPYRIGHT.php for copyright notices and details.
*/

namespace ls\tests\funtional\admin;
namespace ls\tests\acceptance\admin;

use Facebook\WebDriver\WebDriverBy;
use ls\tests\TestBaseClassWeb;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* See COPYRIGHT.php for copyright notices and details.
*/

namespace ls\tests\funtional\admin;
namespace ls\tests\acceptance\admin\questions;

use Facebook\WebDriver\WebDriverBy;
use ls\tests\TestBaseClassWeb;
Expand Down

0 comments on commit 0464548

Please sign in to comment.