- $CurrentProfile.BlogProfileImage.setWidth(180)
+ $CurrentProfile.BlogProfileImage.ScaleWidth(180)
diff --git a/templates/Includes/PostSummary.ss b/templates/Includes/PostSummary.ss
index 91a699a..b06d1f1 100644
--- a/templates/Includes/PostSummary.ss
+++ b/templates/Includes/PostSummary.ss
@@ -8,7 +8,7 @@
">
- $FeaturedImage.setWidth(795)
+ $FeaturedImage.ScaleWidth(795)
diff --git a/templates/BlogAdminSidebar_holder.ss b/templates/SilverStripe/Blog/Forms/BlogAdminSidebar_holder.ss
similarity index 100%
rename from templates/BlogAdminSidebar_holder.ss
rename to templates/SilverStripe/Blog/Forms/BlogAdminSidebar_holder.ss
diff --git a/templates/GridFieldAddByDBField.ss b/templates/SilverStripe/Blog/Forms/GridField/GridFieldAddByDBField.ss
similarity index 100%
rename from templates/GridFieldAddByDBField.ss
rename to templates/SilverStripe/Blog/Forms/GridField/GridFieldAddByDBField.ss
diff --git a/templates/forms/TabSet_holder.ss b/templates/SilverStripe/Blog/Forms/TabSet_holder.ss
similarity index 93%
rename from templates/forms/TabSet_holder.ss
rename to templates/SilverStripe/Blog/Forms/TabSet_holder.ss
index 85bc11c..dd2337d 100644
--- a/templates/forms/TabSet_holder.ss
+++ b/templates/SilverStripe/Blog/Forms/TabSet_holder.ss
@@ -1,4 +1,4 @@
-
- <%-- this resets ths template (from TabSet_holder) and renders using forTemplate --%>
- $setTemplate('')
-
\ No newline at end of file
+
+ <%-- this resets ths template (from TabSet_holder) and renders using forTemplate --%>
+ $setTemplate('')
+
diff --git a/templates/Layout/Blog.ss b/templates/SilverStripe/Blog/Model/Layout/Blog.ss
similarity index 100%
rename from templates/Layout/Blog.ss
rename to templates/SilverStripe/Blog/Model/Layout/Blog.ss
diff --git a/templates/Layout/BlogPost.ss b/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
similarity index 81%
rename from templates/Layout/BlogPost.ss
rename to templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
index f3839dc..df0b7db 100644
--- a/templates/Layout/BlogPost.ss
+++ b/templates/SilverStripe/Blog/Model/Layout/BlogPost.ss
@@ -1,20 +1,20 @@
-<% require themedCSS('blog', 'blog') %>
-
-
-
-<% include BlogSideBar %>
+<% require themedCSS('blog', 'blog') %>
+
+
+
+<% include BlogSideBar %>
diff --git a/templates/Layout/Blog_profile.ss b/templates/SilverStripe/Blog/Model/Layout/Blog_profile.ss
similarity index 100%
rename from templates/Layout/Blog_profile.ss
rename to templates/SilverStripe/Blog/Model/Layout/Blog_profile.ss
diff --git a/tests/BlogCategoryTest.php b/tests/BlogCategoryTest.php
index c29aa95..d9de583 100755
--- a/tests/BlogCategoryTest.php
+++ b/tests/BlogCategoryTest.php
@@ -1,5 +1,17 @@
logout();
}
- $this->objFromFixture('BlogPost', 'FirstBlogPost');
+ $this->objFromFixture(BlogPost::class, 'FirstBlogPost');
/**
* @var BlogCategory $category
*/
- $category = $this->objFromFixture('BlogCategory', 'FirstCategory');
+ $category = $this->objFromFixture(BlogCategory::class, 'FirstCategory');
$this->assertEquals(5, $category->BlogPosts()->count(), 'Category blog post count');
}
@@ -57,7 +69,7 @@ class BlogCategoryTest extends FunctionalTest
*/
public function testAllowMultibyteUrlSegment()
{
- $blog = $this->objFromFixture('Blog', 'FirstBlog');
+ $blog = $this->objFromFixture(Blog::class, 'FirstBlog');
$cat = new BlogCategory();
$cat->BlogID = $blog->ID;
$cat->Title = 'تست';
@@ -72,10 +84,10 @@ class BlogCategoryTest extends FunctionalTest
{
$this->useDraftSite();
- $this->objFromFixture('Member', 'Admin');
+ $this->objFromFixture(Member::class, 'Admin');
- $editor = $this->objFromFixture('Member', 'Editor');
- $category = $this->objFromFixture('BlogCategory', 'SecondCategory');
+ $editor = $this->objFromFixture(Member::class, 'Editor');
+ $category = $this->objFromFixture(BlogCategory::class, 'SecondCategory');
$this->assertFalse($category->canView($editor), 'Editor should not be able to view category.');
}
@@ -87,20 +99,20 @@ class BlogCategoryTest extends FunctionalTest
{
$this->useDraftSite();
- $admin = $this->objFromFixture('Member', 'Admin');
- $editor = $this->objFromFixture('Member', 'Editor');
+ $admin = $this->objFromFixture(Member::class, 'Admin');
+ $editor = $this->objFromFixture(Member::class, 'Editor');
- $category = $this->objFromFixture('BlogCategory', 'FirstCategory');
+ $category = $this->objFromFixture(BlogCategory::class, 'FirstCategory');
$this->assertTrue($category->canEdit($admin), 'Admin should be able to edit category.');
$this->assertTrue($category->canEdit($editor), 'Editor should be able to edit category.');
- $category = $this->objFromFixture('BlogCategory', 'SecondCategory');
+ $category = $this->objFromFixture(BlogCategory::class, 'SecondCategory');
$this->assertTrue($category->canEdit($admin), 'Admin should be able to edit category.');
$this->assertFalse($category->canEdit($editor), 'Editor should not be able to edit category.');
- $category = $this->objFromFixture('BlogCategory', 'ThirdCategory');
+ $category = $this->objFromFixture(BlogCategory::class, 'ThirdCategory');
$this->assertTrue($category->canEdit($admin), 'Admin should always be able to edit category.');
$this->assertTrue($category->canEdit($editor), 'Editor should be able to edit category.');
@@ -110,10 +122,10 @@ class BlogCategoryTest extends FunctionalTest
{
$this->useDraftSite();
- $admin = $this->objFromFixture('Member', 'Admin');
- $editor = $this->objFromFixture('Member', 'Editor');
+ $admin = $this->objFromFixture(Member::class, 'Admin');
+ $editor = $this->objFromFixture(Member::class, 'Editor');
- $category = singleton('BlogCategory');
+ $category = singleton(BlogCategory::class);
$this->assertTrue($category->canCreate($admin), 'Admin should be able to create category.');
$this->assertTrue($category->canCreate($editor), 'Editor should be able to create category.');
@@ -123,24 +135,25 @@ class BlogCategoryTest extends FunctionalTest
{
$this->useDraftSite();
- $admin = $this->objFromFixture('Member', 'Admin');
- $editor = $this->objFromFixture('Member', 'Editor');
+ $admin = $this->objFromFixture(Member::class, 'Admin');
+ $editor = $this->objFromFixture(Member::class, 'Editor');
- $category = $this->objFromFixture('BlogCategory', 'FirstCategory');
+ $category = $this->objFromFixture(BlogCategory::class, 'FirstCategory');
$this->assertTrue($category->canDelete($admin), 'Admin should be able to delete category.');
$this->assertTrue($category->canDelete($editor), 'Editor should be able to category category.');
- $category = $this->objFromFixture('BlogCategory', 'SecondCategory');
+ $category = $this->objFromFixture(BlogCategory::class, 'SecondCategory');
$this->assertTrue($category->canDelete($admin), 'Admin should be able to delete category.');
$this->assertFalse($category->canDelete($editor), 'Editor should not be able to delete category.');
- $category = $this->objFromFixture('BlogCategory', 'ThirdCategory');
+ $category = $this->objFromFixture(BlogCategory::class, 'ThirdCategory');
$this->assertTrue($category->canDelete($admin), 'Admin should always be able to delete category.');
$this->assertTrue($category->canDelete($editor), 'Editor should be able to delete category.');
}
- public function testDuplicateCategories() {
+ public function testDuplicateCategories()
+ {
$blog = new Blog();
$blog->Title = 'Testing for duplicate categories';
$blog->write();
@@ -148,18 +161,20 @@ class BlogCategoryTest extends FunctionalTest
$category = new BlogCategory();
$category->Title = 'Test';
$category->BlogID = $blog->ID;
+ $category->URLSegment = 'test';
$category->write();
$category = new BlogCategory();
$category->Title = 'Test';
+ $category->URLSegment = 'test';
$category->BlogID = $blog->ID;
try {
$category->write();
$this->fail('Duplicate BlogCategory written');
} catch (ValidationException $e) {
- $codeList = $e->getResult()->codeList();
- $this->assertCount(1, $codeList);
- $this->assertEquals(BlogTag::DUPLICATE_EXCEPTION, $codeList[0]);
+ $messages = $e->getResult()->getMessages();
+ $this->assertCount(1, $messages);
+ $this->assertEquals(BlogTag::DUPLICATE_EXCEPTION, $messages[0]['messageType']);
}
}
}
diff --git a/tests/BlogPostFilterTest.php b/tests/BlogPostFilterTest.php
index e878e40..c78fbc9 100755
--- a/tests/BlogPostFilterTest.php
+++ b/tests/BlogPostFilterTest.php
@@ -1,29 +1,41 @@
objFromFixture('Blog', 'FirstBlog');
+ $blog = $this->objFromFixture(Blog::class, 'FirstBlog');
$this->assertEquals(3, $blog->AllChildren()->Count(), 'Filtered blog posts');
- SS_Datetime::set_mock_now('2020-01-01 00:00:00');
+ DBDatetime::set_mock_now('2020-01-01 00:00:00');
$this->assertEquals(5, $blog->AllChildren()->Count(), 'Unfiltered blog posts');
}
diff --git a/tests/BlogPostNotificationsTest.php b/tests/BlogPostNotificationsTest.php
index 25f4073..4129388 100644
--- a/tests/BlogPostNotificationsTest.php
+++ b/tests/BlogPostNotificationsTest.php
@@ -1,11 +1,17 @@
markTestSkipped('Comments Notification module is not installed');
}
- $blogPost = $this->objFromFixture('BlogPost', 'PostC');
- $comment = new Comment();
+ $blogPost = $this->objFromFixture(BlogPost::class, 'PostC');
+ $comment = new \SilverStripe\Comments\Model\Comment();
$comment->Comment = 'This is a comment';
$comment->write();
$recipients = $blogPost->notificationRecipients(
@@ -27,8 +33,10 @@ class BlogPostNotificationsTest extends SapphireTest
}
sort($segments);
- $this->assertEquals(array('blog-contributor', 'blog-editor',
- 'blog-writer', ), $segments);
+ $this->assertEquals(
+ array('blog-contributor', 'blog-editor', 'blog-writer'),
+ $segments
+ );
}
public function testUpdateNotificationSubject()
@@ -36,8 +44,8 @@ class BlogPostNotificationsTest extends SapphireTest
if (!class_exists('CommentNotifier')) {
$this->markTestSkipped('Comments Notification module is not installed');
}
- $blogPost = $this->objFromFixture('BlogPost', 'PostC');
- $comment = new Comment();
+ $blogPost = $this->objFromFixture(BlogPost::class, 'PostC');
+ $comment = new SilverStripe\Comments\Model\Comment();
$comment->Comment = 'This is a comment';
$comment->write();
$recipients = $blogPost->notificationRecipients(
diff --git a/tests/BlogPostTest.php b/tests/BlogPostTest.php
index c527604..09bacba 100644
--- a/tests/BlogPostTest.php
+++ b/tests/BlogPostTest.php
@@ -1,26 +1,27 @@
objFromFixture('Member', $user);
- $pageRecord = $this->objFromFixture('BlogPost', $page);
- SS_Datetime::set_mock_now($date);
+ $userRecord = $this->objFromFixture(Member::class, $user);
+ $pageRecord = $this->objFromFixture(BlogPost::class, $page);
+ DBDatetime::set_mock_now($date);
$this->assertEquals($canView, $pageRecord->canView($userRecord));
}
+ /**
+ * @return array
+ */
public function canViewProvider()
{
$someFutureDate = '2013-10-10 20:00:00';
@@ -70,12 +74,12 @@ class BlogPostTest extends SapphireTest
public function testCandidateAuthors()
{
- $blogpost = $this->objFromFixture('BlogPost', 'PostC');
+ $blogpost = $this->objFromFixture(BlogPost::class, 'PostC');
$this->assertEquals(7, $blogpost->getCandidateAuthors()->count());
//Set the group to draw Members from
- Config::inst()->update('BlogPost', 'restrict_authors_to_group', 'blogusers');
+ Config::inst()->update(BlogPost::class, 'restrict_authors_to_group', 'blogusers');
$this->assertEquals(3, $blogpost->getCandidateAuthors()->count());
@@ -86,12 +90,12 @@ class BlogPostTest extends SapphireTest
public function testCanViewFuturePost()
{
- $blogPost = $this->objFromFixture('BlogPost', 'NullPublishDate');
+ $blogPost = $this->objFromFixture(BlogPost::class, 'NullPublishDate');
- $editor = $this->objFromFixture('Member', 'BlogEditor');
+ $editor = $this->objFromFixture(Member::class, 'BlogEditor');
$this->assertTrue($blogPost->canView($editor));
- $visitor = $this->objFromFixture('Member', 'Visitor');
+ $visitor = $this->objFromFixture(Member::class, 'Visitor');
$this->assertFalse($blogPost->canView($visitor));
}
@@ -101,10 +105,10 @@ class BlogPostTest extends SapphireTest
*/
public function testGetDate()
{
- $blogPost = $this->objFromFixture('BlogPost', 'NullPublishDate');
+ $blogPost = $this->objFromFixture(BlogPost::class, 'NullPublishDate');
$this->assertNull($blogPost->getDate());
- $blogPost = $this->objFromFixture('BlogPost', 'PostA');
+ $blogPost = $this->objFromFixture(BlogPost::class, 'PostA');
$this->assertEquals('2012-01-09 15:00:00', $blogPost->getDate());
}
}
diff --git a/tests/BlogTagTest.php b/tests/BlogTagTest.php
index dcf886c..464a918 100755
--- a/tests/BlogTagTest.php
+++ b/tests/BlogTagTest.php
@@ -1,14 +1,26 @@
logout();
}
- $this->objFromFixture('BlogPost', 'FirstBlogPost');
+ $this->objFromFixture(BlogPost::class, 'FirstBlogPost');
/**
* @var BlogTag $tag
*/
- $tag = $this->objFromFixture('BlogTag', 'FirstTag');
+ $tag = $this->objFromFixture(BlogTag::class, 'FirstTag');
$this->assertEquals(1, $tag->BlogPosts()->count(), 'Tag blog post count');
}
@@ -57,7 +69,7 @@ class BlogTagTest extends FunctionalTest
*/
public function testAllowMultibyteUrlSegment()
{
- $blog = $this->objFromFixture('Blog', 'FirstBlog');
+ $blog = $this->objFromFixture(Blog::class, 'FirstBlog');
$tag = new BlogTag();
$tag->BlogID = $blog->ID;
$tag->Title = 'تست';
@@ -75,15 +87,15 @@ class BlogTagTest extends FunctionalTest
{
$this->useDraftSite();
- $admin = $this->objFromFixture('Member', 'Admin');
- $editor = $this->objFromFixture('Member', 'Editor');
+ $admin = $this->objFromFixture(Member::class, 'Admin');
+ $editor = $this->objFromFixture(Member::class, 'Editor');
- $tag = $this->objFromFixture('BlogTag', 'FirstTag');
+ $tag = $this->objFromFixture(BlogTag::class, 'FirstTag');
$this->assertTrue($tag->canView($admin), 'Admin should be able to view tag.');
$this->assertTrue($tag->canView($editor), 'Editor should be able to view tag.');
- $tag = $this->objFromFixture('BlogTag', 'SecondTag');
+ $tag = $this->objFromFixture(BlogTag::class, 'SecondTag');
$this->assertTrue($tag->canView($admin), 'Admin should be able to view tag.');
$this->assertFalse($tag->canView($editor), 'Editor should not be able to view tag.');
@@ -93,20 +105,20 @@ class BlogTagTest extends FunctionalTest
{
$this->useDraftSite();
- $admin = $this->objFromFixture('Member', 'Admin');
- $editor = $this->objFromFixture('Member', 'Editor');
+ $admin = $this->objFromFixture(Member::class, 'Admin');
+ $editor = $this->objFromFixture(Member::class, 'Editor');
- $tag = $this->objFromFixture('BlogTag', 'FirstTag');
+ $tag = $this->objFromFixture(BlogTag::class, 'FirstTag');
$this->assertTrue($tag->canEdit($admin), 'Admin should be able to edit tag.');
$this->assertTrue($tag->canEdit($editor), 'Editor should be able to edit tag.');
- $tag = $this->objFromFixture('BlogTag', 'SecondTag');
+ $tag = $this->objFromFixture(BlogTag::class, 'SecondTag');
$this->assertTrue($tag->canEdit($admin), 'Admin should be able to edit tag.');
$this->assertFalse($tag->canEdit($editor), 'Editor should not be able to edit tag.');
- $tag = $this->objFromFixture('BlogTag', 'ThirdTag');
+ $tag = $this->objFromFixture(BlogTag::class, 'ThirdTag');
$this->assertTrue($tag->canEdit($admin), 'Admin should always be able to edit tags.');
$this->assertTrue($tag->canEdit($editor), 'Editor should be able to edit tag.');
@@ -116,10 +128,10 @@ class BlogTagTest extends FunctionalTest
{
$this->useDraftSite();
- $admin = $this->objFromFixture('Member', 'Admin');
- $editor = $this->objFromFixture('Member', 'Editor');
+ $admin = $this->objFromFixture(Member::class, 'Admin');
+ $editor = $this->objFromFixture(Member::class, 'Editor');
- $tag = singleton('BlogTag');
+ $tag = singleton(BlogTag::class);
$this->assertTrue($tag->canCreate($admin), 'Admin should be able to create tag.');
$this->assertTrue($tag->canCreate($editor), 'Editor should be able to create tag.');
@@ -129,26 +141,27 @@ class BlogTagTest extends FunctionalTest
{
$this->useDraftSite();
- $admin = $this->objFromFixture('Member', 'Admin');
- $editor = $this->objFromFixture('Member', 'Editor');
+ $admin = $this->objFromFixture(Member::class, 'Admin');
+ $editor = $this->objFromFixture(Member::class, 'Editor');
- $tag = $this->objFromFixture('BlogTag', 'FirstTag');
+ $tag = $this->objFromFixture(BlogTag::class, 'FirstTag');
$this->assertTrue($tag->canDelete($admin), 'Admin should be able to delete tag.');
$this->assertTrue($tag->canDelete($editor), 'Editor should be able to delete tag.');
- $tag = $this->objFromFixture('BlogTag', 'SecondTag');
+ $tag = $this->objFromFixture(BlogTag::class, 'SecondTag');
$this->assertTrue($tag->canDelete($admin), 'Admin should be able to delete tag.');
$this->assertFalse($tag->canDelete($editor), 'Editor should not be able to delete tag.');
- $tag = $this->objFromFixture('BlogTag', 'ThirdTag');
+ $tag = $this->objFromFixture(BlogTag::class, 'ThirdTag');
$this->assertTrue($tag->canDelete($admin), 'Admin should always be able to delete tags.');
$this->assertTrue($tag->canDelete($editor), 'Editor should be able to delete tag.');
}
- public function testDuplicateTagsForURLSegment() {
+ public function testDuplicateTagsForURLSegment()
+ {
$blog = new Blog();
$blog->Title = 'Testing for duplicates blog';
$blog->write();
@@ -162,11 +175,11 @@ class BlogTagTest extends FunctionalTest
$tag2->Title = 'cat test';
$tag2->BlogID = $blog->ID;
$tag2->write();
- $this->assertEquals('cat-test-0', $tag2->URLSegment);
-
+ $this->assertEquals('cat-test-1', $tag2->URLSegment);
}
- public function testDuplicateTags() {
+ public function testDuplicateTags()
+ {
$blog = new Blog();
$blog->Title = 'Testing for duplicate tags';
$blog->write();
@@ -174,19 +187,20 @@ class BlogTagTest extends FunctionalTest
$tag = new BlogTag();
$tag->Title = 'Test';
$tag->BlogID = $blog->ID;
+ $tag->URLSegment = 'test';
$tag->write();
$tag = new BlogTag();
$tag->Title = 'Test';
+ $tag->URLSegment = 'test';
$tag->BlogID = $blog->ID;
try {
$tag->write();
$this->fail('Duplicate BlogTag written');
} catch (ValidationException $e) {
- $codeList = $e->getResult()->codeList();
- $this->assertCount(1, $codeList);
- $this->assertEquals(BlogTag::DUPLICATE_EXCEPTION, $codeList[0]);
+ $messages = $e->getResult()->getMessages();
+ $this->assertCount(1, $messages);
+ $this->assertEquals(BlogTag::DUPLICATE_EXCEPTION, $messages[0]['messageType']);
}
}
-
}
diff --git a/tests/BlogTagsCloudWidgetTest.php b/tests/BlogTagsCloudWidgetTest.php
index d37a2bc..315706e 100644
--- a/tests/BlogTagsCloudWidgetTest.php
+++ b/tests/BlogTagsCloudWidgetTest.php
@@ -1,14 +1,23 @@
markTestSkipped('Widgets module not installed');
}
@@ -23,12 +32,13 @@ class BlogTagsCloudWidgetTest extends SapphireTest {
$this->assertEquals($expected, $names);
}
- public function testGetTags() {
- if (!class_exists('Widget')) {
+ public function testGetTags()
+ {
+ if (!class_exists('SilverStripe\\Widgets\\Model\\Widget')) {
$this->markTestSkipped('Widgets module not installed');
}
$widget = new BlogTagsCloudWidget();
- $blog = $this->objFromFixture('Blog', 'FourthBlog');
+ $blog = $this->objFromFixture(Blog::class, 'FourthBlog');
$widget->BlogID = $blog->ID;
$widget->write();
$tags = $widget->getTags()->toArray();
diff --git a/tests/BlogTest.php b/tests/BlogTest.php
index bfe63fb..386769b 100755
--- a/tests/BlogTest.php
+++ b/tests/BlogTest.php
@@ -1,5 +1,21 @@
objFromFixture('Blog', 'FirstBlog');
+ $blog = $this->objFromFixture(Blog::class, 'FirstBlog');
$blog->publish('Stage', 'Live');
}
@@ -33,7 +49,7 @@ class BlogTest extends SapphireTest
*/
public function tearDown()
{
- SS_Datetime::clear_mock_now();
+ DBDatetime::clear_mock_now();
Config::unnest();
parent::tearDown();
@@ -50,17 +66,17 @@ class BlogTest extends SapphireTest
/**
* @var Blog $blog
*/
- $blog = $this->objFromFixture('Blog', 'FirstBlog');
+ $blog = $this->objFromFixture(Blog::class, 'FirstBlog');
- Config::inst()->update('BlogPost', 'show_in_sitetree', true);
+ Config::inst()->update(BlogPost::class, 'show_in_sitetree', true);
$classes = $blog->getExcludedSiteTreeClassNames();
- $this->assertNotContains('BlogPost', $classes, 'BlogPost class should be hidden.');
+ $this->assertNotContains(BlogPost::class, $classes, 'BlogPost class should be hidden.');
- Config::inst()->update('BlogPost', 'show_in_sitetree', false);
+ Config::inst()->update(BlogPost::class, 'show_in_sitetree', false);
$classes = $blog->getExcludedSiteTreeClassNames();
- $this->assertContains('BlogPost', $classes, 'BlogPost class should be hidden.');
+ $this->assertContains(BlogPost::class, $classes, 'BlogPost class should be hidden.');
}
public function testGetArchivedBlogPosts()
@@ -74,7 +90,7 @@ class BlogTest extends SapphireTest
/**
* @var Blog $blog
*/
- $blog = $this->objFromFixture('Blog', 'FirstBlog');
+ $blog = $this->objFromFixture(Blog::class, 'FirstBlog');
$archive = $blog->getArchivedBlogPosts(2013);
@@ -96,7 +112,7 @@ class BlogTest extends SapphireTest
/**
* @var Blog $blog
*/
- $blog = $this->objFromFixture('Blog', 'FirstBlog');
+ $blog = $this->objFromFixture(Blog::class, 'FirstBlog');
$link = Controller::join_links($blog->Link('archive'), '2013', '10', '01');
@@ -135,8 +151,8 @@ class BlogTest extends SapphireTest
*/
public function testArchiveYear()
{
- $blog = $this->objFromFixture('Blog', 'FirstBlog');
- $controller = new Blog_Controller($blog);
+ $blog = $this->objFromFixture(Blog::class, 'FirstBlog');
+ $controller = new BlogController($blog);
$this->requestURL($controller, 'first-post/archive/');
$this->assertEquals(2013, $controller->getArchiveYear(), 'getArchiveYear should return 2013');
}
@@ -156,47 +172,47 @@ class BlogTest extends SapphireTest
/**
* @var Blog $firstBlog
*/
- $firstBlog = $this->objFromFixture('Blog', 'FirstBlog');
+ $firstBlog = $this->objFromFixture(Blog::class, 'FirstBlog');
/**
* @var Blog $fourthBlog
*/
- $fourthBlog = $this->objFromFixture('Blog', 'FourthBlog');
+ $fourthBlog = $this->objFromFixture(Blog::class, 'FourthBlog');
/**
* @var BlogPost $postA
*/
- $postA = $this->objFromFixture('BlogPost', 'PostA');
+ $postA = $this->objFromFixture(BlogPost::class, 'PostA');
/**
* @var BlogPost $postB
*/
- $postB = $this->objFromFixture('BlogPost', 'PostB');
+ $postB = $this->objFromFixture(BlogPost::class, 'PostB');
/**
* @var BlogPost $postC
*/
- $postC = $this->objFromFixture('BlogPost', 'PostC');
+ $postC = $this->objFromFixture(BlogPost::class, 'PostC');
/**
* @var Member $editor
*/
- $editor = $this->objFromFixture('Member', 'BlogEditor');
+ $editor = $this->objFromFixture(Member::class, 'BlogEditor');
/**
* @var Member $writer
*/
- $writer = $this->objFromFixture('Member', 'Writer');
+ $writer = $this->objFromFixture(Member::class, 'Writer');
/**
* @var Member $contributor
*/
- $contributor = $this->objFromFixture('Member', 'Contributor');
+ $contributor = $this->objFromFixture(Member::class, 'Contributor');
/**
* @var Member $visitor
*/
- $visitor = $this->objFromFixture('Member', 'Visitor');
+ $visitor = $this->objFromFixture(Member::class, 'Visitor');
$this->assertEquals('Editor', $fourthBlog->RoleOf($editor));
$this->assertEquals('Contributor', $fourthBlog->RoleOf($contributor));
@@ -274,9 +290,9 @@ class BlogTest extends SapphireTest
public function testFilteredCategories()
{
- $blog = $this->objFromFixture('Blog', 'FirstBlog');
- $controller = new Blog_Controller($blog);
-
+ $blog = $this->objFromFixture(Blog::class, 'FirstBlog');
+ $controller = new BlogController($blog);
+
// Root url
$this->requestURL($controller, 'first-post');
$this->assertIDsEquals(
@@ -293,10 +309,10 @@ class BlogTest extends SapphireTest
);
// Posts
- $firstPostID = $this->idFromFixture('BlogPost', 'FirstBlogPost');
- $secondPostID = $this->idFromFixture('BlogPost', 'SecondBlogPost');
- $firstFuturePostID = $this->idFromFixture('BlogPost', 'FirstFutureBlogPost');
- $secondFuturePostID = $this->idFromFixture('BlogPost', 'SecondFutureBlogPost');
+ $firstPostID = $this->idFromFixture(BlogPost::class, 'FirstBlogPost');
+ $secondPostID = $this->idFromFixture(BlogPost::class, 'SecondBlogPost');
+ $firstFuturePostID = $this->idFromFixture(BlogPost::class, 'FirstFutureBlogPost');
+ $secondFuturePostID = $this->idFromFixture(BlogPost::class, 'SecondFutureBlogPost');
// Request first tag
$this->requestURL($controller, 'first-post/tag/first-tag');
@@ -321,10 +337,10 @@ class BlogTest extends SapphireTest
*/
protected function requestURL(ContentController $controller, $url)
{
- $request = new SS_HTTPRequest('get', $url);
+ $request = new HTTPRequest('get', $url);
$request->match('$URLSegment//$Action/$ID/$OtherID');
$request->shift();
- $controller->init();
+ $controller->doInit();
$controller->handleRequest($request, new DataModel());
}
diff --git a/tests/blog.yml b/tests/blog.yml
index e664f88..79a09f3 100755
--- a/tests/blog.yml
+++ b/tests/blog.yml
@@ -1,6 +1,6 @@
# Mock date is set to 2013-10-01 20:00:00
-Group:
+SilverStripe\Security\Group:
Administrators:
Title: Administrators
Editors:
@@ -9,193 +9,193 @@ Group:
Title: Blog Users
Code: blogusers
-Permission:
+SilverStripe\Security\Permission:
Administrators:
Code: ADMIN
- Group: =>Group.Administrators
+ Group: =>SilverStripe\Security\Group.Administrators
Editors:
Code: CMS_ACCESS_CMSMain
- Group: =>Group.Editors
+ Group: =>SilverStripe\Security\Group.Editors
BlogUsers:
Code: CMS_ACCESS_CMSMain
- Group: =>Group.BlogUsers
+ Group: =>SilverStripe\Security\Group.BlogUsers
-SiteConfig:
+SilverStripe\SiteConfig\SiteConfig:
Default:
CanEditType: 'OnlyTheseUsers'
CanCreateTopLevelType: 'OnlyTheseUsers'
- EditorGroups: =>Group.Administrators,=>Group.Editors
- CreateTopLevelGroups: =>Group.Administrators,=>Group.Editors
+ EditorGroups: =>SilverStripe\Security\Group.Administrators,=>SilverStripe\Security\Group.Editors
+ CreateTopLevelGroups: =>SilverStripe\Security\Group.Administrators,=>SilverStripe\Security\Group.Editors
-Member:
+SilverStripe\Security\Member:
Admin:
FirstName: Test
Surname: Administrator
- Groups: =>Group.Administrators
+ Groups: =>SilverStripe\Security\Group.Administrators
Editor:
FirstName: Test
Surname: Editor
- Groups: =>Group.Editors
+ Groups: =>SilverStripe\Security\Group.Editors
BlogEditor:
FirstName: Blog
Surname: Editor
- Groups: =>Group.BlogUsers
+ Groups: =>SilverStripe\Security\Group.BlogUsers
Writer:
FirstName: Blog
Surname: Writer
- Groups: =>Group.BlogUsers
+ Groups: =>SilverStripe\Security\Group.BlogUsers
Contributor:
FirstName: Blog
Surname: Contributor
- Groups: =>Group.BlogUsers
+ Groups: =>SilverStripe\Security\Group.BlogUsers
Visitor:
FirstName: Blog
Surname: Visitor
-Blog:
+SilverStripe\Blog\Model\Blog:
FirstBlog:
Title: 'First Blog'
SecondBlog:
Title: 'Second Blog'
CanViewType: 'OnlyTheseUsers'
CanEditType: 'OnlyTheseUsers'
- ViewerGroups: =>Group.Administrators
- EditorGroups: =>Group.Administrators
+ ViewerGroups: =>SilverStripe\Security\Group.Administrators
+ EditorGroups: =>SilverStripe\Security\Group.Administrators
ThirdBlog:
Title: 'Third Blog'
CanEditType: 'OnlyTheseUsers'
- EditorGroups: =>Group.Editors
+ EditorGroups: =>SilverStripe\Security\Group.Editors
FourthBlog:
Title: 'Fourth Blog'
- Editors: =>Member.BlogEditor
- Writers: =>Member.Writer
- Contributors: =>Member.Contributor
+ Editors: =>SilverStripe\Security\Member.BlogEditor
+ Writers: =>SilverStripe\Security\Member.Writer
+ Contributors: =>SilverStripe\Security\Member.Contributor
-BlogTag:
+SilverStripe\Blog\Model\BlogTag:
FirstTag:
Title: 'First Tag'
URLSegment: 'first-tag'
- Blog: =>Blog.FirstBlog
+ Blog: =>SilverStripe\Blog\Model\Blog.FirstBlog
SecondTag:
Title: 'Second Tag'
URLSegment: 'second-tag'
- Blog: =>Blog.SecondBlog
+ Blog: =>SilverStripe\Blog\Model\Blog.SecondBlog
ThirdTag:
Title: 'Third Tag'
URLSegment: 'third-tag'
- Blog: =>Blog.ThirdBlog
+ Blog: =>SilverStripe\Blog\Model\Blog.ThirdBlog
#Tags for Tag Cloud widget
PopularTag:
Title: 'Popular'
URLSegment: 'popular-tag'
- Blog: =>Blog.FourthBlog
+ Blog: =>SilverStripe\Blog\Model\Blog.FourthBlog
CoolTag:
Title: 'Cool'
URLSegment: 'cool-tag'
- Blog: =>Blog.FourthBlog
+ Blog: =>SilverStripe\Blog\Model\Blog.FourthBlog
CatTag:
Title: 'Cat'
URLSegment: 'cat-tag'
- Blog: =>Blog.FourthBlog
+ Blog: =>SilverStripe\Blog\Model\Blog.FourthBlog
KiwiTag:
Title: 'Kiwi'
URLSegment: 'kiwi-tag'
- Blog: =>Blog.FourthBlog
+ Blog: =>SilverStripe\Blog\Model\Blog.FourthBlog
-BlogCategory:
+SilverStripe\Blog\Model\BlogCategory:
FirstCategory:
Title: 'First Category'
URLSegment: 'first-category'
- Blog: =>Blog.FirstBlog
+ Blog: =>SilverStripe\Blog\Model\Blog.FirstBlog
SecondCategory:
Title: 'Second Category'
URLSegment: 'second-category'
- Blog: =>Blog.SecondBlog
+ Blog: =>SilverStripe\Blog\Model\Blog.SecondBlog
ThirdCategory:
Title: 'Third Category'
URLSegment: 'third-category'
- Blog: =>Blog.ThirdBlog
+ Blog: =>SilverStripe\Blog\Model\Blog.ThirdBlog
-BlogPost:
+SilverStripe\Blog\Model\BlogPost:
FirstBlogPost:
Title: 'First Post'
URLSegment: first-post
PublishDate: '2013-10-01 15:00:00'
- Parent: =>Blog.FirstBlog
- Tags: =>BlogTag.FirstTag
- Categories: =>BlogCategory.FirstCategory
+ Parent: =>SilverStripe\Blog\Model\Blog.FirstBlog
+ Tags: =>SilverStripe\Blog\Model\BlogTag.FirstTag
+ Categories: =>SilverStripe\Blog\Model\BlogCategory.FirstCategory
SecondBlogPost:
Title: 'Second Post'
URLSegment: second-post
PublishDate: '2013-09-01 15:00:00'
- Parent: =>Blog.FirstBlog
+ Parent: =>SilverStripe\Blog\Model\Blog.FirstBlog
ThirdBlogPost:
Title: 'Old Post'
URLSegment: old-post
PublishDate: '2012-01-09 15:00:00'
- Parent: =>Blog.FirstBlog
+ Parent: =>SilverStripe\Blog\Model\Blog.FirstBlog
FirstFutureBlogPost:
Title: 'Future Post'
URLSegment: future-post
PublishDate: '2015-01-01 00:00:00'
- Tags: =>BlogTag.FirstTag
- Categories: =>BlogCategory.FirstCategory
- Parent: =>Blog.FirstBlog
+ Tags: =>SilverStripe\Blog\Model\BlogTag.FirstTag
+ Categories: =>SilverStripe\Blog\Model\BlogCategory.FirstCategory
+ Parent: =>SilverStripe\Blog\Model\Blog.FirstBlog
SecondFutureBlogPost:
Title: 'Future Post 2'
URLSegment: future-post-2
PublishDate: '2013-11-01 00:00:00'
- Tags: =>BlogTag.FirstTag
- Categories: =>BlogCategory.FirstCategory
- Parent: =>Blog.FirstBlog
+ Tags: =>SilverStripe\Blog\Model\BlogTag.FirstTag
+ Categories: =>SilverStripe\Blog\Model\BlogCategory.FirstCategory
+ Parent: =>SilverStripe\Blog\Model\Blog.FirstBlog
PostA:
Title: 'One Post'
PublishDate: '2012-01-09 15:00:00'
- Parent: =>Blog.FourthBlog
- Authors: =>Member.Writer,=>Member.Contributor
+ Parent: =>SilverStripe\Blog\Model\Blog.FourthBlog
+ Authors: =>SilverStripe\Security\Member.Writer,=>SilverStripe\Security\Member.Contributor
PostB:
Title: 'Second Post'
PublishDate: '2012-01-09 15:00:00'
- Parent: =>Blog.FourthBlog
- Authors: =>Member.BlogEditor
+ Parent: =>SilverStripe\Blog\Model\Blog.FourthBlog
+ Authors: =>SilverStripe\Security\Member.BlogEditor
PostC:
Title: 'Third Post'
PublishDate: '2012-01-09 15:00:00'
- Parent: =>Blog.FourthBlog
- Authors: =>Member.BlogEditor,=>Member.Writer,=>Member.Contributor
+ Parent: =>SilverStripe\Blog\Model\Blog.FourthBlog
+ Authors: =>SilverStripe\Security\Member.BlogEditor,=>SilverStripe\Security\Member.Writer,=>SilverStripe\Security\Member.Contributor
NullPublishDate:
Title: 'No publish date'
- PublishDate: 'NULL'
- Parent: =>Blog.FourthBlog
- Authors: =>Member.BlogEditor,=>Member.Writer,=>Member.Contributor
+ PublishDate: ''
+ Parent: =>SilverStripe\Blog\Model\Blog.FourthBlog
+ Authors: =>SilverStripe\Security\Member.BlogEditor,=>SilverStripe\Security\Member.Writer,=>SilverStripe\Security\Member.Contributor
#Posts for the tag cloud widget test
TaggedPost1:
Title: 'Tagged Post 1'
URLSegment: tagged-post-1
PublishDate: '2012-01-09 15:00:00'
- Tags: =>BlogTag.PopularTag,=>BlogTag.CoolTag
- Categories: =>BlogCategory.FirstCategory
- Parent: =>Blog.FourthBlog
+ Tags: =>SilverStripe\Blog\Model\BlogTag.PopularTag,=>SilverStripe\Blog\Model\BlogTag.CoolTag
+ Categories: =>SilverStripe\Blog\Model\BlogCategory.FirstCategory
+ Parent: =>SilverStripe\Blog\Model\Blog.FourthBlog
TaggedPost2:
Title: 'Tagged Post 2'
URLSegment: tagged-post-2
PublishDate: '2012-01-09 15:00:00'
- Tags: =>BlogTag.PopularTag,=>BlogTag.CoolTag,=>BlogTag.CatTag
- Categories: =>BlogCategory.FirstCategory
- Parent: =>Blog.FourthBlog
+ Tags: =>SilverStripe\Blog\Model\BlogTag.PopularTag,=>SilverStripe\Blog\Model\BlogTag.CoolTag,=>SilverStripe\Blog\Model\BlogTag.CatTag
+ Categories: =>SilverStripe\Blog\Model\BlogCategory.FirstCategory
+ Parent: =>SilverStripe\Blog\Model\Blog.FourthBlog
TaggedPost3:
Title: 'Tagged Post 3'
URLSegment: tagged-post-3
PublishDate: '2012-01-09 17:20:00'
- Tags: =>BlogTag.PopularTag,=>BlogTag.CoolTag,=>BlogTag.CatTag,=>BlogTag.KiwiTag
- Categories: =>BlogCategory.FirstCategory
- Parent: =>Blog.FourthBlog
+ Tags: =>SilverStripe\Blog\Model\BlogTag.PopularTag,=>SilverStripe\Blog\Model\BlogTag.CoolTag,=>SilverStripe\Blog\Model\BlogTag.CatTag,=>SilverStripe\Blog\Model\BlogTag.KiwiTag
+ Categories: =>SilverStripe\Blog\Model\BlogCategory.FirstCategory
+ Parent: =>SilverStripe\Blog\Model\Blog.FourthBlog
TaggedPost4:
Title: 'Tagged Post 4'
URLSegment: tagged-post-4
PublishDate: '2012-04-09 15:00:00'
- Tags: =>BlogTag.PopularTag
- Categories: =>BlogCategory.FirstCategory
- Parent: =>Blog.FourthBlog
+ Tags: =>SilverStripe\Blog\Model\BlogTag.PopularTag
+ Categories: =>SilverStripe\Blog\Model\BlogCategory.FirstCategory
+ Parent: =>SilverStripe\Blog\Model\Blog.FourthBlog