Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions tests/Functional/RuleSet/DeclarationBlockTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
use PHPUnit\Framework\TestCase;
use Sabberworm\CSS\OutputFormat;
use Sabberworm\CSS\Parsing\ParserState;
use Sabberworm\CSS\Property\Declaration;
use Sabberworm\CSS\Property\Selector;
use Sabberworm\CSS\Rule\Rule;
use Sabberworm\CSS\RuleSet\DeclarationBlock;
use Sabberworm\CSS\Settings;

Expand Down Expand Up @@ -46,22 +46,22 @@ public function parseReturnsNullForInvalidDeclarationBlock(string $invalidDeclar
/**
* @test
*/
public function rendersRulesInOrderProvided(): void
public function rendersDeclarationsInOrderProvided(): void
{
$declarationBlock = new DeclarationBlock();
$declarationBlock->setSelectors([new Selector('.test')]);

$rule1 = new Rule('background-color');
$rule1->setValue('transparent');
$declarationBlock->addRule($rule1);
$declaration1 = new Declaration('background-color');
$declaration1->setValue('transparent');
$declarationBlock->addRule($declaration1);

$rule2 = new Rule('background');
$rule2->setValue('#222');
$declarationBlock->addRule($rule2);
$declaration2 = new Declaration('background');
$declaration2->setValue('#222');
$declarationBlock->addRule($declaration2);

$rule3 = new Rule('background-color');
$rule3->setValue('#fff');
$declarationBlock->addRule($rule3);
$declaration3 = new Declaration('background-color');
$declaration3->setValue('#fff');
$declarationBlock->addRule($declaration3);

$expectedRendering = 'background-color: transparent;background: #222;background-color: #fff';
self::assertStringContainsString($expectedRendering, $declarationBlock->render(new OutputFormat()));
Expand Down
14 changes: 7 additions & 7 deletions tests/Unit/RuleSet/DeclarationBlockTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
use Sabberworm\CSS\Parsing\ParserState;
use Sabberworm\CSS\Parsing\UnexpectedTokenException;
use Sabberworm\CSS\Position\Positionable;
use Sabberworm\CSS\Property\Declaration;
use Sabberworm\CSS\Property\Selector;
use Sabberworm\CSS\Rule\Rule;
use Sabberworm\CSS\RuleSet\DeclarationBlock;
use Sabberworm\CSS\RuleSet\RuleSet;
use Sabberworm\CSS\Settings;
Expand Down Expand Up @@ -391,7 +391,7 @@ public function getRuleSetOnVirginReturnsARuleSet(): void
*/
public function getRuleSetAfterRulesSetReturnsARuleSet(): void
{
$this->subject->setRules([new Rule('color')]);
$this->subject->setRules([new Declaration('color')]);

$result = $this->subject->getRuleSet();

Expand All @@ -401,7 +401,7 @@ public function getRuleSetAfterRulesSetReturnsARuleSet(): void
/**
* @test
*/
public function getRuleSetOnVirginReturnsObjectWithoutRules(): void
public function getRuleSetOnVirginReturnsObjectWithoutDeclarations(): void
{
$result = $this->subject->getRuleSet();

Expand All @@ -415,14 +415,14 @@ public function getRuleSetOnVirginReturnsObjectWithoutRules(): void
*
* @dataProvider providePropertyNames
*/
public function getRuleSetReturnsObjectWithRulesSet(array $propertyNamesToSet): void
public function getRuleSetReturnsObjectWithDeclarationsSet(array $propertyNamesToSet): void
{
$rules = self::createRulesFromPropertyNames($propertyNamesToSet);
$this->subject->setRules($rules);
$declarations = self::createDeclarationsFromPropertyNames($propertyNamesToSet);
$this->subject->setRules($declarations);

$result = $this->subject->getRuleSet();

self::assertSame($rules, $result->getRules());
self::assertSame($declarations, $result->getRules());
}

/**
Expand Down
Loading