testcase request methods

rueduphp · Jun 9, 2017 · ca978b4 · ca978b4
1 parent bb0822b
commit ca978b4
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/lib/lib.php b/lib/lib.php
@@ -5636,7 +5636,7 @@ function mailer()
                 $transport = \Swift_SmtpTransport::newInstance(
                     appenv('SMTP_HOST', 'localhost'),
                     appenv('SMTP_PORT', 443),
-                    'ssl'
+                    appenv('SMTP_SECURITY', 'ssl')
                 )
                 ->setUsername(appenv('SMTP_USER', 'root'))
                 ->setPassword(appenv('SMTP_PASSWORD', 'root'));

diff --git a/lib/testcase.php b/lib/testcase.php
@@ -144,6 +144,30 @@ public function patch($url, $options = [])
 
         public function request($type, $url, $options = [])
         {
-            return client()->request(Strings::upper($type), $url, $options);
+            if (!fnmatch('*://*', $url)) {
+                if (isset($_ENV['APPLICATION_URL'])) {
+                    $url = $_ENV['APPLICATION_URL'] . $url;
+                }
+            }
+
+            $response = client()->request(Strings::upper($type), $url, $options);
+
+            $customResponse = dyn($response);
+
+            $customResponse->macro('content', function ($response) {
+                return $response->getBody()->getContents();
+            });
+
+            $customResponse->macro('header', function ($key, $response) {
+                if ($response->hasHeader($key)) {
+                    $header = $response->getHeader($key);
+
+                    return is_array($header) && count($header) == 1 ? current($header) : $header;
+                }
+
+                return null;
+            });
+
+            return $customResponse;
         }
     }