fix Twig globals not being reset each request, and handle cp/site Twi…

…g instances

src/http/RequestBuilder.php

@@ -86,12 +86,6 @@ public function send(): TestableResponse
 
     protected function setGlobals()
     {
-        $view = \Craft::$app->getView();
-        $globals = (new Extension($view, $view->getTwig()))->getGlobals();
-        foreach ($globals as $key => $value) {
-            $view->getTwig()->addGlobal($key, $value);
-        }
-
         $this->originalGlobals['_POST'] = array_merge($_POST);
         $this->originalGlobals['_SERVER'] = array_merge($_SERVER);
         $_SERVER['HTTP_METHOD'] = $this->method;

src/http/RequestHandler.php

@@ -2,6 +2,7 @@
 
 namespace markhuot\craftpest\http;
 
+use craft\web\twig\Extension;
 use markhuot\craftpest\http\requests\WebRequest;
 use markhuot\craftpest\web\TestableResponse;
 use Twig\Error\RuntimeError;
@@ -81,10 +82,11 @@ protected function handleException(\Throwable $exception, WebRequest $request):
         return $response;
     }
 
-    private function registerWithCraft($request): void
+    protected function registerWithCraft($request): void
     {
+        // Don't run the queue automatically, because it injects JS in to pages that might not be expecting
+        // them under test
         $this->app->getConfig()->getGeneral()->runQueueAutomatically = false;
-        $this->app->getView()->setTemplateMode($request->isCpRequest ? 'cp' : 'site');
 
         // The next request
         $this->app->set('request', $request);
@@ -115,5 +117,19 @@ private function registerWithCraft($request): void
                 'ruleConfig' => ['class' => \craft\web\UrlRule::class],
             ],
         ]);
+
+        // Pull out our view service
+        $view = \Craft::$app->getView();
+
+        // Set the correct template mode
+        $view->setTemplateMode($request->isCpRequest ? 'cp' : 'site');
+
+        // Update the Twig globals. Normally PHP/Craft operate in a single request/response
+        // lifecycle. However, because we're sending multiple requests through a single
+        // Craft instance we need to manually update the globals
+        $globals = (new Extension($view, $view->getTwig()))->getGlobals();
+        foreach ($globals as $key => $value) {
+            $view->getTwig()->addGlobal($key, $value);
+        }
     }
 }

tests/templates/current-user.twig

@@ -0,0 +1 @@
+{{ currentUser.getId()|default }}