Skip to content

Commit cfa8b22

Browse files
committed
[BUGFIX] Move fixtures into fixtures folder for generating new rules
1 parent 933b0cd commit cfa8b22

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

packages/fractor-rule-generator/src/Finder/TemplateFinder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private function addRuleAndTestCase(string $fixtureFileExtension): array
4242
return [
4343
__DIR__ . '/../../templates/rules/TYPO3__MajorPrefixed__/__Type__/__Name__.php',
4444
__DIR__ . '/../../templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/__Name__Test.php.inc',
45-
__DIR__ . '/../../templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixture/fixture.' . $fixtureFileExtension,
45+
__DIR__ . '/../../templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/Fixtures/fixture.' . $fixtureFileExtension,
4646
__DIR__ . '/../../templates/rules-tests/TYPO3__MajorPrefixed__/__Type__/__Test_Directory__/config/fractor.php.inc',
4747
];
4848
}

packages/fractor-rule-generator/tests/Functional/Console/Command/GenerateRuleCommandTest.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function testCreateRuleForFlexFormWithoutChangelog(): void
9898
self::assertFileExists($basePathConfig . '/typo3-7.php');
9999
self::assertFileExists($basePathRules . '/TYPO3v7/FlexForm/MigrateFlexFormFractor.php');
100100
self::assertFileExists($basePathRuleTests . '/TYPO3v7/FlexForm/MigrateFlexFormFractor/config/fractor.php');
101-
self::assertFileExists($basePathRuleTests . '/TYPO3v7/FlexForm/MigrateFlexFormFractor/Fixture/fixture.xml');
101+
self::assertFileExists($basePathRuleTests . '/TYPO3v7/FlexForm/MigrateFlexFormFractor/Fixtures/fixture.xml');
102102
self::assertFileExists(
103103
$basePathRuleTests . '/TYPO3v7/FlexForm/MigrateFlexFormFractor/MigrateFlexFormFractorTest.php.inc'
104104
);
@@ -141,7 +141,7 @@ public function testCreateRuleForFlexFormWithChangelog(): void
141141
self::assertFileExists($basePathConfig . '/typo3-7.php');
142142
self::assertFileExists($basePathRules . '/TYPO3v7/FlexForm/MigrateFlexFormFractor.php');
143143
self::assertFileExists($basePathRuleTests . '/TYPO3v7/FlexForm/MigrateFlexFormFractor/config/fractor.php');
144-
self::assertFileExists($basePathRuleTests . '/TYPO3v7/FlexForm/MigrateFlexFormFractor/Fixture/fixture.xml');
144+
self::assertFileExists($basePathRuleTests . '/TYPO3v7/FlexForm/MigrateFlexFormFractor/Fixtures/fixture.xml');
145145
self::assertFileExists(
146146
$basePathRuleTests . '/TYPO3v7/FlexForm/MigrateFlexFormFractor/MigrateFlexFormFractorTest.php.inc'
147147
);
@@ -176,7 +176,7 @@ public function testCreateRuleForFluidWithoutChangelog(): void
176176
self::assertFileExists($basePathConfig . '/typo3-7.php');
177177
self::assertFileExists($basePathRules . '/TYPO3v7/Fluid/MigrateFluidFractor.php');
178178
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Fluid/MigrateFluidFractor/config/fractor.php');
179-
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Fluid/MigrateFluidFractor/Fixture/fixture.html');
179+
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Fluid/MigrateFluidFractor/Fixtures/fixture.html');
180180
self::assertFileExists(
181181
$basePathRuleTests . '/TYPO3v7/Fluid/MigrateFluidFractor/MigrateFluidFractorTest.php.inc'
182182
);
@@ -216,7 +216,7 @@ public function testCreateRuleForFluidWithChangelog(): void
216216
self::assertFileExists($basePathConfig . '/typo3-7.php');
217217
self::assertFileExists($basePathRules . '/TYPO3v7/Fluid/MigrateFluidFractor.php');
218218
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Fluid/MigrateFluidFractor/config/fractor.php');
219-
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Fluid/MigrateFluidFractor/Fixture/fixture.html');
219+
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Fluid/MigrateFluidFractor/Fixtures/fixture.html');
220220
self::assertFileExists(
221221
$basePathRuleTests . '/TYPO3v7/Fluid/MigrateFluidFractor/MigrateFluidFractorTest.php.inc'
222222
);
@@ -251,7 +251,7 @@ public function testCreateRuleForTypoScriptWithoutChangelog(): void
251251
self::assertFileExists($basePathRules . '/TYPO3v7/TypoScript/MigrateTypoScriptFractor.php');
252252
self::assertFileExists($basePathRuleTests . '/TYPO3v7/TypoScript/MigrateTypoScriptFractor/config/fractor.php');
253253
self::assertFileExists(
254-
$basePathRuleTests . '/TYPO3v7/TypoScript/MigrateTypoScriptFractor/Fixture/fixture.typoscript'
254+
$basePathRuleTests . '/TYPO3v7/TypoScript/MigrateTypoScriptFractor/Fixtures/fixture.typoscript'
255255
);
256256
self::assertFileExists(
257257
$basePathRuleTests . '/TYPO3v7/TypoScript/MigrateTypoScriptFractor/MigrateTypoScriptFractorTest.php.inc'
@@ -296,7 +296,7 @@ public function testCreateRuleForTypoScriptWithChangelog(): void
296296
self::assertFileExists($basePathRules . '/TYPO3v7/TypoScript/MigrateTypoScriptFractor.php');
297297
self::assertFileExists($basePathRuleTests . '/TYPO3v7/TypoScript/MigrateTypoScriptFractor/config/fractor.php');
298298
self::assertFileExists(
299-
$basePathRuleTests . '/TYPO3v7/TypoScript/MigrateTypoScriptFractor/Fixture/fixture.typoscript'
299+
$basePathRuleTests . '/TYPO3v7/TypoScript/MigrateTypoScriptFractor/Fixtures/fixture.typoscript'
300300
);
301301
self::assertFileExists(
302302
$basePathRuleTests . '/TYPO3v7/TypoScript/MigrateTypoScriptFractor/MigrateTypoScriptFractorTest.php.inc'
@@ -331,7 +331,7 @@ public function testCreateRuleForYamlWithoutChangelog(): void
331331
self::assertFileExists($basePathConfig . '/typo3-7.php');
332332
self::assertFileExists($basePathRules . '/TYPO3v7/Yaml/MigrateYamlFractor.php');
333333
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Yaml/MigrateYamlFractor/config/fractor.php');
334-
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Yaml/MigrateYamlFractor/Fixture/fixture.yaml');
334+
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Yaml/MigrateYamlFractor/Fixtures/fixture.yaml');
335335
self::assertFileExists(
336336
$basePathRuleTests . '/TYPO3v7/Yaml/MigrateYamlFractor/MigrateYamlFractorTest.php.inc'
337337
);
@@ -371,7 +371,7 @@ public function testCreateRuleForYamlWithChangelog(): void
371371
self::assertFileExists($basePathConfig . '/typo3-7.php');
372372
self::assertFileExists($basePathRules . '/TYPO3v7/Yaml/MigrateYamlFractor.php');
373373
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Yaml/MigrateYamlFractor/config/fractor.php');
374-
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Yaml/MigrateYamlFractor/Fixture/fixture.yaml');
374+
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Yaml/MigrateYamlFractor/Fixtures/fixture.yaml');
375375
self::assertFileExists(
376376
$basePathRuleTests . '/TYPO3v7/Yaml/MigrateYamlFractor/MigrateYamlFractorTest.php.inc'
377377
);
@@ -405,7 +405,7 @@ public function testCreateRuleForComposerWithoutChangelog(): void
405405
self::assertFileExists($basePathConfig . '/typo3-7.php');
406406
self::assertFileExists($basePathRules . '/TYPO3v7/Composer/MigrateComposerFractor.php');
407407
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Composer/MigrateComposerFractor/config/fractor.php');
408-
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Composer/MigrateComposerFractor/Fixture/fixture.json');
408+
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Composer/MigrateComposerFractor/Fixtures/fixture.json');
409409
self::assertFileExists(
410410
$basePathRuleTests . '/TYPO3v7/Composer/MigrateComposerFractor/MigrateComposerFractorTest.php.inc'
411411
);
@@ -448,7 +448,7 @@ public function testCreateRuleForComposerWithChangelog(): void
448448
self::assertFileExists($basePathConfig . '/typo3-7.php');
449449
self::assertFileExists($basePathRules . '/TYPO3v7/Composer/MigrateComposerFractor.php');
450450
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Composer/MigrateComposerFractor/config/fractor.php');
451-
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Composer/MigrateComposerFractor/Fixture/fixture.json');
451+
self::assertFileExists($basePathRuleTests . '/TYPO3v7/Composer/MigrateComposerFractor/Fixtures/fixture.json');
452452
self::assertFileExists(
453453
$basePathRuleTests . '/TYPO3v7/Composer/MigrateComposerFractor/MigrateComposerFractorTest.php.inc'
454454
);

0 commit comments

Comments
 (0)