Skip to content
This repository was archived by the owner on Dec 6, 2019. It is now read-only.

Fixes #3

Closed
wants to merge 4 commits into from
Closed

Fixes #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3b2228
phpunit.xml is expected to be in component root
Maks3w Apr 30, 2015
eab39dc
Use a single .gitignore for component
Maks3w Apr 30, 2015
67b22de
Exclude vendor in component .gitignore
Maks3w Apr 30, 2015
1ce1a7a
place component tests directly inside of test
Maks3w Apr 30, 2015
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
4 changes: 4 additions & 0 deletions assets/root-files/gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,7 @@
build/
nbproject
tmp/

phpunit.xml
test/TestConfiguration.php
vendor
4 changes: 2 additions & 2 deletions assets/root-files/phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<phpunit bootstrap="./test/Bootstrap.php" colors="true">
<phpunit bootstrap="./Bootstrap.php" colors="true">
Copy link
Member

@weierophinney weierophinney Apr 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No; the phpunit.xml.dist file is in the root, and the test bootstrap is under test/. The original was correct.

<testsuites>
<testsuite name="zend-{COMPONENT} Test Suite">
<directory>./test/{COMPONENT_NAME}</directory>
<directory>./test</directory>
</testsuite>
</testsuites>

Expand Down
2 changes: 0 additions & 2 deletions assets/test-files/gitignore
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion bin/composer-rewriter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
// Setup development autoloading rules
$composer['autoload-dev'] = [
'psr-4' => [
'ZendTest\\' . $component . '\\' => 'test/' . $component . '/',
'ZendTest\\' . $component . '\\' => 'test/',
Copy link
Member

@weierophinney weierophinney Apr 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See my note on the tree-filter script.

],
];

Expand Down
5 changes: 2 additions & 3 deletions bin/tree-filter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,10 @@
}

// Test directory files
copy($assetDir . '/test-files/gitignore', 'test/.gitignore');
file_put_contents(
'test/Bootstrap.php',
str_replace('{COMPONENT}', $normalized, file_get_contents($assetDir . '/test-files/Bootstrap.php'))
);
copy($testConfigDist, 'test/TestConfiguration.php.dist');
copy($testConfigTravis, 'test/TestConfiguration.php.travis');
copy($testConfigDist, 'TestConfiguration.php.dist');
copy($testConfigTravis, 'TestConfiguration.php.travis');
Copy link
Member

@weierophinney weierophinney Apr 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. I did this for a reason. I wanted the test assets (bootstrap, test configuration) in the /test root, which is why I pushed the component tests one level down. I really don't want the bootstrap or test configuration files under the root; phpunit.xml.dist makes sense there to simplify running the tests, but it acts like the other dot-files in that regard.

exit(0);