tonyair
/
silverstripe-docsviewer
mirror of https://github.com/silverstripe/silverstripe-docsviewer
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed test errors 

Adjusted composer requirements
This commit is contained in:
UndefinedOffset 2019-01-07 14:15:44 -04:00
parent 7483ce70b4
commit f54472f4a5
9 changed files with 49 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -14,7 +14,7 @@
"irc": "irc://irc.freenode.org/silverstripe"
},
"require": {
"silverstripe/framework": "~4.3",
"silverstripe/recipe-core": "~4.3",
"erusev/parsedown-extra": "~0.7",
"erusev/parsedown": "~1.7",
"mnapoli/front-yaml": "^1.6"

4
tests/DocumentationEntityTest.php
View File

@ -1,14 +1,10 @@
<?php
namespace SilverStripe\DocsViewer\Tests;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\DocsViewer\Models\DocumentationEntity;
class DocumentationEntityTest extends SapphireTest
{
public function dataCompare()

4
tests/DocumentationHelperTests.php
View File

@ -1,14 +1,10 @@
<?php
namespace SilverStripe\DocsViewer\Tests;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\DocsViewer\DocumentationHelper;
/**
* @package docsviewer
* @subpackage tests

6
tests/DocumentationManifestTests.php
View File

@ -1,14 +1,10 @@
<?php
namespace SilverStripe\DocsViewer\Tests;
use SilverStripe\Core\Config\Config;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\DocsViewer\Controllers\DocumentationViewer;
use SilverStripe\DocsViewer\DocumentationManifest;
use SilverStripe\DocsViewer\Controllers\DocumentationViewer;
/**

18
tests/DocumentationPageTest.php
View File

@ -1,18 +1,14 @@
<?php
namespace SilverStripe\DocsViewer\Tests;
use SilverStripe\Core\Config\Config;
use SilverStripe\Control\Director;
use SilverStripe\Core\Config\Config;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\DocsViewer\Models\DocumentationEntity;
use SilverStripe\DocsViewer\Controllers\DocumentationViewer;
use SilverStripe\DocsViewer\DocumentationManifest;
use SilverStripe\DocsViewer\Models\DocumentationPage;
use SilverStripe\DocsViewer\Controllers\DocumentationViewer;
use SilverStripe\DocsViewer\Models\DocumentationEntity;
use SilverStripe\DocsViewer\Models\DocumentationFolder;
use SilverStripe\DocsViewer\Models\DocumentationPage;
/**
@ -27,13 +23,13 @@ class DocumentationPageTest extends SapphireTest
{
parent::setUp();
Config::nest();
$this->entity = new DocumentationEntity('doctest');
$this->entity->setPath(DOCSVIEWER_PATH . '/tests/docs/en/');
$this->entity->setVersion('2.4');
$this->entity->setLanguage('en');
Config::nest();
// explicitly use dev/docs. Custom paths should be tested separately
Config::inst()->update(DocumentationViewer::class, 'link_base', 'dev/docs/');
@ -44,7 +40,7 @@ class DocumentationPageTest extends SapphireTest
{
parent::tearDown();
Config::unnest();
@Config::unnest();
}
public function testGetLink()

18
tests/DocumentationParserTest.php
View File

@ -1,22 +1,16 @@
<?php
namespace SilverStripe\DocsViewer\Tests;
use SilverStripe\Core\Config\Config;
use SilverStripe\Control\Director;
use SilverStripe\Control\Controller;
use SilverStripe\ORM\DataObject;
use SilverStripe\Control\Director;
use SilverStripe\Core\Config\Config;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\DocsViewer\DocumentationManifest;
use SilverStripe\DocsViewer\DocumentationParser;
use SilverStripe\DocsViewer\Controllers\DocumentationViewer;
use SilverStripe\DocsViewer\Models\DocumentationEntity;
use SilverStripe\DocsViewer\Models\DocumentationPage;
use SilverStripe\DocsViewer\DocumentationManifest;
use SilverStripe\DocsViewer\DocumentationParser;
use SilverStripe\DocsViewer\Tests\DocumentationParserTest;
use SilverStripe\ORM\DataObject;
/**
@ -31,7 +25,7 @@ class DocumentationParserTest extends SapphireTest
{
parent::tearDown();
Config::unnest();
@Config::unnest();
}
public function setUp()

9
tests/DocumentationPermalinksTest.php
View File

@ -1,15 +1,14 @@
<?php
namespace SilverStripe\DocsViewer\Tests;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\Session;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\FunctionalTest;
use SilverStripe\DocsViewer\DocumentationPermalinks;
use SilverStripe\DocsViewer\Controllers\DocumentationViewer;
/**
* @package docsviewer
* @subpackage tests
@ -52,7 +51,9 @@ class DocumentationPermalinksTest extends FunctionalTest
$this->autoFollowRedirection = false;
$v = new DocumentationViewer();
$response = $v->handleRequest(new HTTPRequest('GET', 'foo'));
$request = new HTTPRequest('GET', 'foo');
$request->setSession(Injector::inst()->create(Session::class, array()));
$response = $v->handleRequest($request);
$this->assertEquals('301', $response->getStatusCode());
$this->assertContains('en/framework/subfolder/foo', $response->getHeader('Location'));

24
tests/DocumentationViewerTest.php
View File

@ -1,18 +1,17 @@
<?php
namespace SilverStripe\DocsViewer\Tests;
use SilverStripe\Control\Director;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\Session;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\FunctionalTest;
use SilverStripe\DocsViewer\DocumentationManifest;
use SilverStripe\DocsViewer\Controllers\DocumentationViewer;
use SilverStripe\View\SSViewer;
/**
* Some of these tests are simply checking that pages load. They should not assume
* somethings working.
@ -85,7 +84,7 @@ class DocumentationViewerTest extends FunctionalTest
{
parent::tearDown();
Config::unnest();
@Config::unnest();
}
/**
@ -162,8 +161,11 @@ class DocumentationViewerTest extends FunctionalTest
public function testGetMenu()
{
$v = new DocumentationViewer();
$session = Injector::inst()->create(Session::class, array());
// check with children
$response = $v->handleRequest(new HTTPRequest('GET', 'en/doc_test/2.3/'));
$request = new HTTPRequest('GET', 'en/doc_test/2.3/');
$request->setSession($session);
$response = $v->handleRequest($request);
$expected = array(
Director::baseURL() . 'dev/docs/en/doc_test/2.3/sort/' => 'Sort',
@ -175,7 +177,8 @@ class DocumentationViewerTest extends FunctionalTest
$this->assertEquals($expected, $actual);
$response = $v->handleRequest(new HTTPRequest('GET', 'en/doc_test/2.4/'));
$request = new HTTPRequest('GET', 'en/doc_test/2.4/');
$request->setSession($session);
$this->assertEquals('current', $v->getMenu()->first()->LinkingMode);
// 2.4 stable release has 1 child page (not including index)
@ -196,11 +199,16 @@ class DocumentationViewerTest extends FunctionalTest
public function testGetLanguage()
{
$v = new DocumentationViewer();
$response = $v->handleRequest(new HTTPRequest('GET', 'en/doc_test/2.3/'));
$session = Injector::inst()->create(Session::class, array());
$request = new HTTPRequest('GET', 'en/doc_test/2.3/');
$request->setSession($session);
$response = $v->handleRequest($request);
$this->assertEquals('en', $v->getLanguage());
$response = $v->handleRequest(new HTTPRequest('GET', 'en/doc_test/2.3/subfolder/subsubfolder/subsubpage/'));
$request = new HTTPRequest('GET', 'en/doc_test/2.3/subfolder/subsubfolder/subsubpage/');
$request->setSession($session);
$response = $v->handleRequest($request);
$this->assertEquals('en', $v->getLanguage());
}

20
tests/DocumentationViewerVersionWarningTest.php
View File

@ -1,16 +1,15 @@
<?php
namespace SilverStripe\DocsViewer\Tests;
use SilverStripe\Control\HTTPRequest;
use SilverStripe\Control\Session;
use SilverStripe\Core\Config\Config;
use SilverStripe\Core\Injector\Injector;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\DocsViewer\DocumentationManifest;
use SilverStripe\DocsViewer\Controllers\DocumentationViewer;
/**
* @package docsviewer
* @subpackage tests
@ -76,27 +75,34 @@ class DocumentationViewerVersionWarningTest extends SapphireTest
{
parent::tearDown();
Config::unnest();
@Config::unnest();
}
public function testVersionWarning()
{
$v = new DocumentationViewer();
$session = Injector::inst()->create(Session::class, array());
// the current version is set to 2.4, no notice should be shown on that page
$response = $v->handleRequest(new HTTPRequest('GET', 'en/testdocs/'));
$request = new HTTPRequest('GET', 'en/testdocs/');
$request->setSession($session);
$response = $v->handleRequest($request);
// $this->assertFalse($v->VersionWarning());
// 2.3 is an older release, hitting that should return us an outdated flag
$response = $v->handleRequest(new HTTPRequest('GET', 'en/testdocs/2.3/'));
$request = new HTTPRequest('GET', 'en/testdocs/2.3/');
$request->setSession($session);
$response = $v->handleRequest($request);
$warn = $v->VersionWarning();
// $this->assertTrue($warn->OutdatedRelease);
// $this->assertNull($warn->FutureRelease);
// 3.0 is a future release
$response = $v->handleRequest(new HTTPRequest('GET', 'en/testdocs/3.0/'));
$request = new HTTPRequest('GET', 'en/testdocs/3.0/');
$request->setSession($session);
$response = $v->handleRequest($request);
$warn = $v->VersionWarning();
// $this->assertNull($warn->OutdatedRelease);