tests: remove touch, typo

h4kuna · Jul 7, 2017 · 8aba728 · 8aba728
1 parent 366f175
commit 8aba728
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ php:
 
 before_script:
   - composer self-update
-  - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then NTESTER_FLAGS="phpdbg --coverage ./coverage.xml --coverage-src ./src"; else TESTER_FLAGS=""; fi
+  - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then NTESTER_FLAGS="phpdbg --coverage ./coverage.xml --coverage-src ./src"; else NTESTER_FLAGS=""; fi
 
 after_script:
     - if [ "$TRAVIS_PHP_VERSION" == "7.1" ]; then

diff --git a/tests/src/AssetsTest.phpt b/tests/src/AssetsTest.phpt
@@ -6,8 +6,7 @@ use Tester\Assert;
 
 $container = require __DIR__ . '/../bootsrap.php';
 
-$time = 1490036475;
-touch(__DIR__ . '/../config/php-unix.ini', $time);
+$time = filemtime(__DIR__ . '/../config/php-unix.ini');
 
 test(function() use ($container, $time) {
 	/* @var $assets Assets */

diff --git a/tests/src/BasicRunTest.phpt b/tests/src/BasicRunTest.phpt
@@ -5,8 +5,7 @@ use h4kuna\Assets,
 
 $container = require __DIR__ . '/../bootsrap.php';
 
-$time = 1490036475; // mtime jsquery
-touch(__DIR__ . '/../config/php-unix.ini', $time);
+$time = filemtime(__DIR__ . '/../config/php-unix.ini');
 
 /* @var $file Assets\File */
 $file = $container->getByType(Assets\File::class);
@@ -17,4 +16,4 @@ Assert::same('/config/php-unix.ini?' . $time, $file->createUrl('config/php-unix.
 
 Assert::same('//www.example.com/config/test.neon', preg_replace('~\?.*~', '', $file->createUrl('//config/test.neon')));
 
-Assert::same('/temp/jquery-3.2.1.min.js?' . $time, $file->createUrl('temp/jquery-3.2.1.min.js'));
+Assert::same('/temp/jquery-3.2.1.min.js?1490036475', $file->createUrl('temp/jquery-3.2.1.min.js'));
diff --git a/tests/src/DI/AssetsExtensionTest.phpt b/tests/src/DI/AssetsExtensionTest.phpt
@@ -55,27 +55,28 @@ Assert::exception(function() {
 	configuratorFactory('file-not-found.neon');
 }, Assets\FileNotFoundException::class);
 
+
 Assert::exception(function() {
 	configuratorFactory('fs-main.neon', TRUE);
 }, Assets\DirectoryIsNotWriteableException::class);
 
-$x = function() {
+
+test(function() {
 	touch(__DIR__ . '/assets/main.js', 123456789);
 	$container = configuratorFactory('fs-main.neon');
 	$file = $container->getByType(Assets\File::class);
 	/* @var $file \h4kuna\Assets\File */
 	Assert::same('/temp/main.js?123456789', $file->createUrl('temp/main.js'));
-};
-$x();
+});
+
 
-$x = function() {
+test(function() {
 	touch(__DIR__ . '/assets/main.js', 123456789);
 	$container = configuratorFactory('fs-main-alias.neon');
 	$file = $container->getByType(Assets\File::class);
 	/* @var $file \h4kuna\Assets\File */
 	Assert::same('/temp/app/index.js?123456789', $file->createUrl('temp/app/index.js'));
-};
-$x();
+});
 
 
 Assert::exception(function() {