Skip to content

Commit 316a109

Browse files
committed
Port last of min_unit_tests, remove references to it, add composer script
1 parent 9370e96 commit 316a109

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+12
-401
lines changed

.gitattributes

-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@
22
/.gitignore export-ignore
33
/.gitattributes export-ignore
44
/min_extras export-ignore
5-
/min_unit_tests export-ignore
65
/tests export-ignore

README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,8 @@ Support
6868
Unit Testing
6969
------------
7070

71-
1. Open the file `min_unit_tests/_inc.php`.
72-
1. Enable the file by commenting out the `die()` statement.
73-
1. Access: http://example.org/min/min_unit_tests/test_all.php (If you wish, the other test_*.php files can be run to test individual components with more verbose output.)
74-
1. Re-disable the `_inc.php` file when you are done.
71+
1. Install via Composer
72+
1. `composer run test`
7573

7674
Warnings
7775
--------

UPGRADING.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ UPGRADING FROM 2.1.*
77
/min/config.php --> /min/old_config.php
88
/min/groupsConfig.php --> /min/old_groupsConfig.php
99

10-
2. Overwrite all files in /min (and /min_unit_tests) with those from this zip.
10+
2. Overwrite all files in /min with those from this zip.
1111

1212
3. Delete /min/groupsConfig.php
1313

composer.json

+3
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,8 @@
3535
"suggest": {
3636
"leafo/lessphp": "~0.4.0",
3737
"meenie/javascript-packer": "~1.1"
38+
},
39+
"scripts": {
40+
"test": "phpunit"
3841
}
3942
}

docs/TestingMinify.wiki.md

-12
This file was deleted.

docs/UserGuide.wiki.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,4 @@ url.rewrite-once = ( "^/min/([a-z]=.*)" => "/min/index.php?$1" )
128128

129129
# Problems?
130130

131-
See [CommonProblems](CommonProblems.wiki.md) and [Debugging](Debugging.wiki.md). You might also try [TestingMinify](TestingMinify.wiki.md) (running `test_environment.php` in particular).
131+
See [CommonProblems](CommonProblems.wiki.md) and [Debugging](Debugging.wiki.md). You might also try running `server-info.php` in particular.

min_extras/cli/minify.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
if ($cli->isHelpRequest) {
2222
echo $cli->getArgumentsListing();
2323
}
24-
echo "EXAMPLE: ./minify.php ../../min_unit_tests/_test_files/js/*.js\n";
25-
echo "EXAMPLE: ./minify.php -d../.. ../../min_unit_tests/_test_files/css/*.css\n";
24+
echo "EXAMPLE: ./minify.php ../../tests/_test_files/js/*.js\n";
25+
echo "EXAMPLE: ./minify.php -d../.. ../../tests/_test_files/css/*.css\n";
2626
echo "EXAMPLE: echo \"var js = 'Awesome' && /cool/;\" | ./minify.php -t js\n";
2727
echo "EXAMPLE: echo \"sel > ector { prop: 'value '; }\" | ./minify.php -t css\n";
2828
echo "\n";

min_extras/cli/rewrite-uris.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
if ($cli->isHelpRequest) {
1919
echo $cli->getArgumentsListing();
2020
}
21-
echo "EXAMPLE: ./rewrite-uris.php -v -d../.. ../../min_unit_tests/_test_files/css/paths_rewrite.css ../../min_unit_tests/_test_files/css/comments.css
21+
echo "EXAMPLE: ./rewrite-uris.php -v -d../.. ../../tests/_test_files/css/paths_rewrite.css ../../tests/_test_files/css/comments.css
2222
\n";
2323
exit(0);
2424
}

min_unit_tests/.htaccess

-4
This file was deleted.

min_unit_tests/HTTP_ConditionalGet/2.php

-43
This file was deleted.

min_unit_tests/HTTP_ConditionalGet/3.php

-39
This file was deleted.

min_unit_tests/HTTP_ConditionalGet/4.php

-47
This file was deleted.

min_unit_tests/HTTP_ConditionalGet/5.php

-26
This file was deleted.

min_unit_tests/HTTP_ConditionalGet/_include.php

-64
This file was deleted.

min_unit_tests/HTTP_ConditionalGet/index.php

-35
This file was deleted.

min_unit_tests/HTTP_Encoder/green.png

-202 Bytes
Binary file not shown.

min_unit_tests/HTTP_Encoder/index.php

-57
This file was deleted.

0 commit comments

Comments
 (0)