opdavies/drupal-module-tdd-blog
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use the NodeCreationTrait, remove validParams

Browse source
This commit is contained in:
Oliver Davies 2018-04-19 14:25:42 +01:00
parent 41bcbb50ab
commit f8a864b6cc
1 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tests/src/Kernel/PageListTest.php
View file

@ -4,6 +4,7 @@ namespace Drupal\Tests\tdd_dublin\Kernel;
use Drupal\KernelTests\Core\Entity\EntityKernelTestBase; use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
use Drupal\node\Entity\Node; use Drupal\node\Entity\Node;
use Drupal\Tests\node\Traits\NodeCreationTrait;
use Drupal\views\ResultRow; use Drupal\views\ResultRow;
/** /**
@ -11,6 +12,8 @@ use Drupal\views\ResultRow;
*/ */
class PageListTest extends EntityKernelTestBase { class PageListTest extends EntityKernelTestBase {
use NodeCreationTrait;
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
@ -26,10 +29,10 @@ class PageListTest extends EntityKernelTestBase {
protected function setUp() { protected function setUp() {
parent::setUp(); parent::setUp();
$this->installConfig(['tdd_dublin']);
$this->installEntitySchema('node'); $this->installEntitySchema('node');
$this->installEntitySchema('user'); $this->installEntitySchema('user');
$this->installConfig(['filter', 'tdd_dublin']);
} }
/** /**
@ -40,13 +43,13 @@ class PageListTest extends EntityKernelTestBase {
*/ */
public function testOnlyPublishedPagesAreShown() { public function testOnlyPublishedPagesAreShown() {
// This is a published page, so it should be visible. // This is a published page, so it should be visible.
Node::create($this->validParams(['status' => TRUE]))->save(); $this->createNode(['status' => TRUE]);
// This is an article, so it should not be visible. // This is an article, so it should not be visible.
Node::create($this->validParams(['type' => 'article']))->save(); $this->createNode(['type' => 'article']);
// This page is not published, so it should not be visible. // This page is not published, so it should not be visible.
Node::create($this->validParams(['status' => FALSE]))->save(); $this->createNode(['status' => FALSE]);
// Rather than testing the rendered HTML, we are going to load the view // Rather than testing the rendered HTML, we are going to load the view
// results programmatically and run assertions against the data it returns. // results programmatically and run assertions against the data it returns.
@ -77,10 +80,10 @@ class PageListTest extends EntityKernelTestBase {
// written against the expected order based on these titles. If they // written against the expected order based on these titles. If they
// weren't added, each title would be automatically generated so the // weren't added, each title would be automatically generated so the
// expected order would not be known beforehand. // expected order would not be known beforehand.
Node::create($this->validParams(['title' => 'Page A']))->save(); $this->createNode(['title' => 'Page A']);
Node::create($this->validParams(['title' => 'Page D']))->save(); $this->createNode(['title' => 'Page D']);
Node::create($this->validParams(['title' => 'Page C']))->save(); $this->createNode(['title' => 'Page C']);
Node::create($this->validParams(['title' => 'Page B']))->save(); $this->createNode(['title' => 'Page B']);
// Get the result data from the view. // Get the result data from the view.
$nids = array_map(function (ResultRow $result) { $nids = array_map(function (ResultRow $result) {
@ -92,21 +95,4 @@ class PageListTest extends EntityKernelTestBase {
$this->assertEquals([1, 4, 3, 2], $nids); $this->assertEquals([1, 4, 3, 2], $nids);
} }
/**
* Default parameters for creating test nodes.
*
* @param array $overrides
* An associative array of overridden values.
*
* @return array
* The overridden parameters array, combined with the defaults.
*/
private function validParams(array $overrides = []) {
return array_merge([
'status' => TRUE,
'title' => $this->randomString(),
'type' => 'page',
], $overrides);
}
} }