Merge pull request #319 from lptn/update-test-files-structure

Cleaner tests structure (organize by type)

codeception.yml

@@ -1,10 +1,14 @@
+# @see https://codeception.com/docs/reference/Configuration
+
 paths:
-    tests: tests
-    output: tests/_output
-    data: tests/_data
-    support: tests/_support
-    envs: tests/_envs
+    tests: tests/Acceptance
+    data: tests/Acceptance/_data
+    support: tests/Acceptance/_support
+    output: tests/Acceptance/_output
+    envs: tests/Acceptance/_envs
+
 actor_suffix: Tester
+
 extensions:
     enabled:
         - Codeception\Extension\RunFailed

phpcs.xml

@@ -26,9 +26,10 @@
     <file>tests</file>
     <exclude-pattern>cache/</exclude-pattern>
     <exclude-pattern>tests/_run/</exclude-pattern>
-    <exclude-pattern>tests/_output</exclude-pattern>
-    <exclude-pattern>tests/_run</exclude-pattern>
-    <exclude-pattern>tests/_support</exclude-pattern>
-    <exclude-pattern>tests/Support/</exclude-pattern><!-- This code mostly copy-paste from https://github.com/psalm/codeception-psalm-module and thus may have different coding-style rules -->
+    <exclude-pattern>tests/Acceptance/_run/</exclude-pattern>
+    <exclude-pattern>tests/Acceptance/_output</exclude-pattern>
+    <exclude-pattern>tests/Acceptance/_run</exclude-pattern>
+    <exclude-pattern>tests/Acceptance/_support</exclude-pattern>
+    <exclude-pattern>tests/Acceptance/Support/</exclude-pattern><!-- This code mostly copy-paste from https://github.com/psalm/codeception-psalm-module and thus may have different coding-style rules -->
     <exclude-pattern>tests/Unit/Handlers/Eloquent/Schema/migrations</exclude-pattern>
 </ruleset>

tests/.gitignore

@@ -0,0 +1 @@
+/_run

tests/Support/Module.php → tests/Acceptance/Support/Module.php

@@ -1,7 +1,9 @@
 <?php
 
-namespace Tests\Psalm\LaravelPlugin\Support;
+namespace Tests\Psalm\LaravelPlugin\Acceptance\Support;
 
+use Behat\Gherkin\Node\PyStringNode;
+use Behat\Gherkin\Node\TableNode;
 use Codeception\Exception\ConfigurationException;
 use Codeception\Exception\ModuleRequireException;
 use Codeception\Exception\TestRuntimeException;
@@ -13,18 +15,44 @@
 use Composer\InstalledVersions;
 use Composer\Semver\Semver;
 use Composer\Semver\VersionParser;
+use OutOfBoundsException;
 use PackageVersions\Versions;
 use PHPUnit\Framework\Assert;
-use Behat\Gherkin\Node\PyStringNode;
-use Behat\Gherkin\Node\TableNode;
-use OutOfBoundsException;
 use PHPUnit\Framework\SkippedTestError;
 use RuntimeException;
 
 use function is_array;
 use function is_int;
 use function is_numeric;
 use function is_string;
+use function array_merge;
+use function array_values;
+use function explode;
+use function join;
+use function json_decode;
+use function preg_match;
+use function realpath;
+use function rtrim;
+use function sprintf;
+use function str_replace;
+use function strlen;
+use function strpos;
+use function assert;
+use function file_exists;
+use function is_dir;
+use function unlink;
+use function mkdir;
+use function array_map;
+use function escapeshellarg;
+use function getcwd;
+use function sha1;
+use function preg_quote;
+use function class_exists;
+use function json_last_error;
+
+use const JSON_ERROR_NONE;
+
+use function json_last_error_msg;
 
 /**
  * Duplicate of https://github.com/psalm/codeception-psalm-module
@@ -290,7 +318,7 @@ public function runPsalmWithDeadCodeDetection(): void
      */
     public function runPsalmWithTaintAnalysis(): void
     {
-        $this->runPsalmIn($this->getDefaultDirectory(), ['--taint-analysis', '--dump-taint-graph=../../taints.dot']);
+        $this->runPsalmIn($this->getDefaultDirectory(), ['--taint-analysis']);
     }
 
     /**

tests/Acceptance/_output/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

tests/Acceptance/_run/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

tests/_support/AcceptanceTester.php → tests/Acceptance/_support/AcceptanceTester.php

@@ -14,12 +14,12 @@
  * @method void pause()
  *
  * @SuppressWarnings(PHPMD)
-*/
+ */
 class AcceptanceTester extends \Codeception\Actor
 {
     use _generated\AcceptanceTesterActions;
 
-   /**
-    * Define custom actions here
-    */
+    /**
+     * Define custom actions here
+     */
 }

tests/_support/FunctionalTester.php → tests/Acceptance/_support/FunctionalTester.php

@@ -14,12 +14,12 @@
  * @method void pause()
  *
  * @SuppressWarnings(PHPMD)
-*/
+ */
 class FunctionalTester extends \Codeception\Actor
 {
     use _generated\FunctionalTesterActions;
 
-   /**
-    * Define custom actions here
-    */
+    /**
+     * Define custom actions here
+     */
 }

tests/_support/UnitTester.php → tests/Acceptance/_support/UnitTester.php

@@ -14,12 +14,12 @@
  * @method void pause()
  *
  * @SuppressWarnings(PHPMD)
-*/
+ */
 class UnitTester extends \Codeception\Actor
 {
     use _generated\UnitTesterActions;
 
-   /**
-    * Define custom actions here
-    */
+    /**
+     * Define custom actions here
+     */
 }

tests/acceptance.suite.yml → tests/Acceptance/acceptance.suite.yml

@@ -1,6 +1,7 @@
 actor: AcceptanceTester
+
 modules:
     enabled:
         - Cli
         - Filesystem
-        - \Tests\Psalm\LaravelPlugin\Support\Module
+        - \Tests\Psalm\LaravelPlugin\Acceptance\Support\Module

tests/acceptance/EloquentModelStubGenerating.feature → tests/Acceptance/acceptance/EloquentModelStubGenerating.feature

@@ -17,7 +17,7 @@ Feature: Eloquent Model stub generating
       """
 
   Scenario: Generate stubs for Eloquent Models
-    When I run Psalm
+      When I run Psalm
     Then Stubs were generated for these Eloquent Models
       | final class Car extends \Eloquent |
       | final class Comment extends \Eloquent |
@@ -29,4 +29,4 @@ Feature: Eloquent Model stub generating
       | final class Secret extends \Eloquent |
       | final class Tag extends \Eloquent |
       | final class User extends \Eloquent |
-      | final class Video extends \Eloquent |
+      | final class Video extends \Eloquent |