From 7d73ea8f7b41593c9d235dfb5919b5fca5d90685 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Fri, 20 Aug 2021 19:02:09 +1200
Subject: [PATCH] MNT Fix unit tests to work with session-manager module

---
 tests/GenerateCSVJobTest.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/GenerateCSVJobTest.php b/tests/GenerateCSVJobTest.php
index ed508a5..507f83f 100644
--- a/tests/GenerateCSVJobTest.php
+++ b/tests/GenerateCSVJobTest.php
@@ -3,6 +3,7 @@
 namespace SilverStripe\GridFieldQueuedExport\Tests;
 
 use SilverStripe\Assets\Filesystem;
+use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Dev\SapphireTest;
@@ -42,8 +43,8 @@ protected function tearDown()
     public function testGenerateExport()
     {
         // Build session
-        $memberID = $this->logInWithPermission('ADMIN');
-        $session = ['loggedInAs' => $memberID];
+        $this->logInWithPermission('ADMIN');
+        $sessionData = Controller::curr()->getRequest()->getSession()->getAll();
 
         // Build controller
         $controller = new GenerateCSVJobTestController();
@@ -51,7 +52,7 @@ public function testGenerateExport()
         $gridfield = $form->Fields()->fieldByName('MyGridfield');
 
         // Build job
-        $job = $this->createJob($gridfield, $session);
+        $job = $this->createJob($gridfield, $sessionData);
         $path = sprintf('%1$s/.exports/%2$s/%2$s.csv', ASSETS_PATH, $job->getSignature());
         $this->paths[] = $path; // Mark for cleanup later
 
@@ -80,8 +81,8 @@ public function testGenerateExportOverMultipleSteps()
         Config::modify()->set(GenerateCSVJob::class, 'chunk_size', 1);
 
         // Build session
-        $memberID = $this->logInWithPermission('ADMIN');
-        $session = ['loggedInAs' => $memberID];
+        $this->logInWithPermission('ADMIN');
+        $sessionData = Controller::curr()->getRequest()->getSession()->getAll();
 
         // Build controller
         $controller = new GenerateCSVJobTestController();
@@ -90,7 +91,7 @@ public function testGenerateExportOverMultipleSteps()
         $gridfield = $form->Fields()->fieldByName('MyGridfield');
 
         // Build job
-        $job = $this->createJob($gridfield, $session);
+        $job = $this->createJob($gridfield, $sessionData);
         $path = sprintf('%1$s/.exports/%2$s/%2$s.csv', ASSETS_PATH, $job->getSignature());
         $this->paths[] = $path; // Mark for cleanup later