tonyair/silverstripe-blog
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-blog synced 2024-10-22 11:05:58 +02:00
Code Issues Projects Releases Wiki Activity

FIX: Corrected checks for date validation in archive method and added supporting tests

Browse Source
This commit is contained in:
micmania1 2014-04-10 13:44:17 +01:00
parent 7511cb02ee
commit 0d098ff231
2 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
model/Blog.php
View File

@ -203,12 +203,12 @@ class Blog_Controller extends Page_Controller {
// If an invalid month has been passed, we can return a 404. // If an invalid month has been passed, we can return a 404.
if($this->request->param("Month") && !$month) { if($this->request->param("Month") && !$month) {
return $this->httpError(404, "Not Found"); return $this->httpError(404, "Not Found");
}
// Check for valid day // Check for valid day
if($this->request->param("Day") && !$day) { if($month && $this->request->param("Day") && !$day) {
return $this->httpError(404, "Not Found"); return $this->httpError(404, "Not Found");
} }
}
if($year) { if($year) {
$this->blogPosts = $this->getArchivedBlogPosts($year, $month, $day); $this->blogPosts = $this->getArchivedBlogPosts($year, $month, $day);

45
tests/BlogTest.php
View File

@ -7,6 +7,8 @@ class BlogTest extends SapphireTest {
public function setUp() { public function setUp() {
SS_Datetime::set_mock_now("2013-10-10 20:00:00"); SS_Datetime::set_mock_now("2013-10-10 20:00:00");
parent::setUp(); parent::setUp();
$this->objFromFixture("Blog", "firstblog")->publish("Stage", "Live");
} }
public function testGetExcludedSiteTreeClassNames() { public function testGetExcludedSiteTreeClassNames() {
@ -47,4 +49,47 @@ class BlogTest extends SapphireTest {
$this->assertEquals(1, $archive->count(), "Incorrect daily archive count."); $this->assertEquals(1, $archive->count(), "Incorrect daily archive count.");
} }
public function testArchiveLinks() {
$blog = $this->objFromFixture("Blog", "firstblog");
// Test valid links
$archiveLink = Controller::join_links($blog->Link("archive"), 2013, 10, 01);
$response = Director::test($archiveLink);
$this->assertEquals(200, $response->getStatusCode(), "HTTP Status should be 200");
$archiveLink = Controller::join_links($blog->Link("archive"), 2013, 10);
$response = Director::test($archiveLink);
$this->assertEquals(200, $response->getStatusCode(), "HTTP Status should be 200");
$archiveLink = Controller::join_links($blog->Link("archive"), 2013);
$response = Director::test($archiveLink);
$this->assertEquals(200, $response->getStatusCode(), "HTTP Status should be 200");
$archiveLink = Controller::join_links($blog->Link("archive"), 2011, 10, 01);
$response = Director::test($archiveLink); // No posts on this date, but a valid entry.
$this->assertEquals(200, $response->getStatusCode(), "HTTP Status should be 200");
// Test invalid links & dates
$response = Director::test($blog->Link("archive")); // 404 when no date is set
$this->assertEquals(404, $response->getStatusCode(), "HTTP Status should be 404");
// Invalid year
$archiveLink = Controller::join_links($blog->Link("archive"), "invalid-year");
$response = Director::test($archiveLink); // 404 when an invalid yer is set
$this->assertEquals(404, $response->getStatusCode(), "HTTP Status should be 404");
// Invalid month
$archiveLink = Controller::join_links($blog->Link("archive"), "2013", "99");
$response = Director::test($archiveLink); // 404 when an invalid month is set
$this->assertEquals(404, $response->getStatusCode(), "HTTP Status should be 404");
// Invalid day
$archiveLink = Controller::join_links($blog->Link("archive"), "2013", "10", "99");
$response = Director::test($archiveLink); // 404 when an invalid day is set
$this->assertEquals(404, $response->getStatusCode(), "HTTP Status should be 404");
}
} }