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
6 changes: 6 additions & 0 deletions src/DefinitionMasksResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
use Rector\Behastan\ValueObject\MaskCollection;
use SplFileInfo;

/**
* @see \Rector\Behastan\Tests\DefinitionMasksResolver\DefinitionMasksResolverTest
*/
final readonly class DefinitionMasksResolver
{
public function __construct(
Expand Down Expand Up @@ -76,6 +79,9 @@ public function resolve(array $contextFiles): MaskCollection
continue;
}

// remove \/ escape from mask
$rawMask = str_replace('\/', '/', $rawMask);

$masks[] = new ExactMask(
$rawMask,
$classMethodContextDefinition->getFilePath(),
Expand Down
3 changes: 3 additions & 0 deletions src/UsedInstructionResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
use RuntimeException;
use Symfony\Component\Finder\SplFileInfo;

/**
* @see \Rector\Behastan\Tests\UsedInstructionResolver\UsedInstructionResolverTest
*/
final class UsedInstructionResolver
{
/**
Expand Down
27 changes: 20 additions & 7 deletions tests/DefinitionMasksResolver/DefinitionMasksResolverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,37 @@

final class DefinitionMasksResolverTest extends AbstractTestCase
{
public function test(): void
private DefinitionMasksResolver $definitionMasksResolver;

private BehatMetafilesFinder $behatMetafilesFinder;

protected function setUp(): void
{
$behatMetafilesFinder = $this->make(BehatMetafilesFinder::class);
$contextFileInfos = $behatMetafilesFinder->findContextFiles([__DIR__ . '/Fixture']);
parent::setUp();

$definitionMasksResolver = $this->make(DefinitionMasksResolver::class);
$this->definitionMasksResolver = $this->make(DefinitionMasksResolver::class);

$maskCollection = $definitionMasksResolver->resolve($contextFileInfos);
$this->behatMetafilesFinder = $this->make(BehatMetafilesFinder::class);
}

$this->assertCount(2, $maskCollection->all());
public function test(): void
{
$contextFileInfos = $this->behatMetafilesFinder->findContextFiles([__DIR__ . '/Fixture']);
$maskCollection = $this->definitionMasksResolver->resolve($contextFileInfos);

$this->assertCount(3, $maskCollection->all());

$exactMasks = $maskCollection->byType(ExactMask::class);
$this->assertCount(2, $exactMasks);
$this->assertCount(3, $exactMasks);
$this->assertContainsOnlyInstancesOf(ExactMask::class, $exactMasks);

$firstExactMask = $exactMasks[0];
$this->assertSame('I click homepage', $firstExactMask->mask);
$this->assertSame(AnotherBehatContext::class, $firstExactMask->className);
$this->assertSame(__DIR__ . '/Fixture/AnotherBehatContext.php', $firstExactMask->filePath);

$slashMask = $exactMasks[2];

$this->assertSame('Do this and / that', $slashMask->mask);
}
}
5 changes: 5 additions & 0 deletions tests/DefinitionMasksResolver/Fixture/AnotherBehatContext.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,9 @@ public function action(): void
public function deadAction(): void
{
}

#[Then('Do this and \/ that')]
public function trickyAction(): void
{
}
}
5 changes: 5 additions & 0 deletions tests/UsedInstructionResolver/Fixture/some_file.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Feature: User login
Scenario: Successful login
Given I am on the login page
When I fill in valid credentials
Then I should see the dashboard
34 changes: 34 additions & 0 deletions tests/UsedInstructionResolver/UsedInstructionResolverTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

declare(strict_types=1);

namespace Rector\Behastan\Tests\UsedInstructionResolver;

use Rector\Behastan\Tests\AbstractTestCase;
use Rector\Behastan\UsedInstructionResolver;
use Symfony\Component\Finder\SplFileInfo;

final class UsedInstructionResolverTest extends AbstractTestCase
{
private UsedInstructionResolver $usedInstructionResolver;

protected function setUp(): void
{
parent::setUp();

$this->usedInstructionResolver = $this->make(UsedInstructionResolver::class);
}

public function test(): void
{
$fileInfo = new SplFileInfo(__DIR__ . '/Fixture/some_file.feature', '', '');

$instructions = $this->usedInstructionResolver->resolveInstructionsFromFeatureFiles([$fileInfo]);

$this->assertSame([
'I am on the login page',
'I fill in valid credentials',
'I should see the dashboard',
], $instructions);
}
}