IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated tests for help controller.

Browse Source
This commit is contained in:
James Cole 2014-12-30 15:55:21 +01:00
parent eedf27f8a5
commit 0acd75a24f
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/HelpController.php
View File

@ -15,6 +15,7 @@ class HelpController extends BaseController
$helpText = '<p>There is no help for this route!</p>'; $helpText = '<p>There is no help for this route!</p>';
$helpTitle = 'Help'; $helpTitle = 'Help';
if (!Route::has($route)) { if (!Route::has($route)) {
\Log::error('No such route: ' . $route);
return Response::json(['title' => $helpTitle, 'text' => $helpText]); return Response::json(['title' => $helpTitle, 'text' => $helpText]);
} }
@ -27,16 +28,20 @@ class HelpController extends BaseController
} }
$uri = 'https://raw.githubusercontent.com/JC5/firefly-iii-help/master/' . e($route) . '.md'; $uri = 'https://raw.githubusercontent.com/JC5/firefly-iii-help/master/' . e($route) . '.md';
\Log::debug('URL is: ' . $uri);
try { try {
$content = file_get_contents($uri); $content = file_get_contents($uri);
} catch (ErrorException $e) { } catch (ErrorException $e) {
$content = '<p>There is no help for this route.</p>'; $content = '<p>There is no help for this route!</p>';
} \Log::error(trim($e->getMessage()));
if (strlen($content) == 0) {
$content = '<p>There is no help for this route.</p>';
} }
\Log::debug('Found help for ' . $route); \Log::debug('Found help for ' . $route);
\Log::debug('Help text length is ' . strlen($content)); \Log::debug('Help text length for route ' . $route . ' is ' . strlen($content));
\Log::debug('Help text IS: "' . $content . '".');
if (strlen(trim($content)) == 0) {
$content = '<p>There is no help for this route.</p>';
}
$helpText = \Michelf\Markdown::defaultTransform($content); $helpText = \Michelf\Markdown::defaultTransform($content);
$helpTitle = $route; $helpTitle = $route;

13
tests/functional/HelpControllerCest.php
View File

@ -49,6 +49,18 @@ class HelpControllerCest
} }
/**
* @param FunctionalTester $I
*/
public function showHelpEmptyHelpFile(FunctionalTester $I)
{
$I->wantTo('show help for a route with no text.');
$I->amOnPage('/help/transactions.doRelate');
$I->canSeeResponseCodeIs(200);
$I->see('There is no help for this route');
}
/** /**
* @param FunctionalTester $I * @param FunctionalTester $I
*/ */
@ -60,6 +72,7 @@ class HelpControllerCest
$I->see('There is no help for this route'); $I->see('There is no help for this route');
} }
//
/** /**
* @param FunctionalTester $I * @param FunctionalTester $I