create .cache directory and move tests to Integration directory

10 files changed, 19 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index 62a128a..0ec40b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
 /vendor/
-/.phpunit.cache/
 
 .env
 
-/credentials.json
-/store/
+/.cache/
diff --git a/bin/matrix-commander b/bin/matrix-commander
index 87ea5ae..ce73a3d 100755
--- a/bin/matrix-commander
+++ b/bin/matrix-commander
@@ -1,3 +1,7 @@
 #!/bin/sh
 
-matrix-commander --no-ssl --plain -c credentials.json $@
+matrix-commander --no-ssl \
+  --credentials .cache/credentials.json \
+  --store .cache/store \
+  --plain \
+  $@
diff --git a/bin/matrix-commander-login b/bin/matrix-commander-login
index 43f21b0..b984dd8 100755
--- a/bin/matrix-commander-login
+++ b/bin/matrix-commander-login
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 matrix-commander --no-ssl \
+  --credentials .cache/credentials.json \
+  --store .cache/store \
   --homeserver=https://localhost:8080 \
   --user-login=php \
   --device=matrix-commander \
diff --git a/composer.json b/composer.json
index 48ff46e..951e156 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,6 @@
         }
     },
     "scripts": {
-        "test": "phpunit --testdox tests"
+        "test": "phpunit"
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
index a2c5ea5..3ccde8e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,7 +2,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         cacheDirectory=".phpunit.cache"
+         cacheDirectory=".cache/phpunit"
          executionOrder="depends,defects"
          requireCoverageMetadata="false"
          beStrictAboutCoverageMetadata="false"
@@ -15,8 +15,8 @@
 >
 
     <testsuites>
-        <testsuite name="default">
-            <directory>tests</directory>
+        <testsuite name="integration">
+            <directory>tests/Integration</directory>
         </testsuite>
     </testsuites>
 
@@ -27,6 +27,6 @@
     </source>
 
     <extensions>
-      <bootstrap class="Tests\PHPUnit\Extensions\ServerExtension\ServerExtension" />
+      <bootstrap class="Tests\Integration\Extensions\ServerExtension\ServerExtension" />
     </extensions>
 </phpunit>
diff --git a/tests/PHPUnit/Extensions/ServerExtension/PostRunSubscriber.php b/tests/Integration/Extensions/ServerExtension/PostRunSubscriber.php
index 46b9377..2495230 100644
--- a/tests/PHPUnit/Extensions/ServerExtension/PostRunSubscriber.php
+++ b/tests/Integration/Extensions/ServerExtension/PostRunSubscriber.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\PHPUnit\Extensions\ServerExtension;
+namespace Tests\Integration\Extensions\ServerExtension;
 
 use PHPUnit\Event\TestRunner\ExecutionFinished;
 use PHPUnit\Event\TestRunner\ExecutionFinishedSubscriber;
diff --git a/tests/PHPUnit/Extensions/ServerExtension/PreRunSubscriber.php b/tests/Integration/Extensions/ServerExtension/PreRunSubscriber.php
index db5cdb4..4ab4180 100644
--- a/tests/PHPUnit/Extensions/ServerExtension/PreRunSubscriber.php
+++ b/tests/Integration/Extensions/ServerExtension/PreRunSubscriber.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\PHPUnit\Extensions\ServerExtension;
+namespace Tests\Integration\Extensions\ServerExtension;
 
 use PHPUnit\Event\TestRunner\ExecutionStarted;
 use PHPUnit\Event\TestRunner\ExecutionStartedSubscriber;
diff --git a/tests/PHPUnit/Extensions/ServerExtension/ServerExtension.php b/tests/Integration/Extensions/ServerExtension/ServerExtension.php
index 9656a14..a94bcb3 100644
--- a/tests/PHPUnit/Extensions/ServerExtension/ServerExtension.php
+++ b/tests/Integration/Extensions/ServerExtension/ServerExtension.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\PHPUnit\Extensions\ServerExtension;
+namespace Tests\Integration\Extensions\ServerExtension;
 
 use PHPUnit\Runner\Extension\Extension;
 use PHPUnit\Runner\Extension\Facade;
diff --git a/tests/ServerImplementationTest.php b/tests/Integration/ServerImplementationTest.php
index a48a8b8..c1c1823 100644
--- a/tests/ServerImplementationTest.php
+++ b/tests/Integration/ServerImplementationTest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace Tests;
+namespace Tests\Integration;
 
 use Symfony\Component\HttpFoundation\Response;
-use Tests\PHPUnit\TestCases\HttpResponseTestCase;
+use Tests\Integration\TestCases\HttpResponseTestCase;
 
 class ServerImplementationTest extends HttpResponseTestCase
 {
diff --git a/tests/PHPUnit/TestCases/HttpResponseTestCase.php b/tests/Integration/TestCases/HttpResponseTestCase.php
index 31dc1d7..43b4859 100644
--- a/tests/PHPUnit/TestCases/HttpResponseTestCase.php
+++ b/tests/Integration/TestCases/HttpResponseTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\PHPUnit\TestCases;
+namespace Tests\Integration\TestCases;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;