From 98ae495879456f2c9f02e962a1a83138e8076ecd Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Mon, 15 Jul 2024 12:54:59 +0900
Subject: [PATCH] Fix Tests

---
 tests/e2e/General/UsageTest.php                      | 12 +++++++-----
 .../Functions/FunctionsConsoleClientTest.php         |  7 +++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/e2e/General/UsageTest.php b/tests/e2e/General/UsageTest.php
index 59df8b6420..a6394fc75f 100644
--- a/tests/e2e/General/UsageTest.php
+++ b/tests/e2e/General/UsageTest.php
@@ -140,7 +140,7 @@ class UsageTest extends Scope
         );
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(12, count($response['body']));
+        $this->assertEquals(16, count($response['body']));
         $this->validateDates($response['body']['network']);
         $this->validateDates($response['body']['requests']);
         $this->validateDates($response['body']['users']);
@@ -321,7 +321,7 @@ class UsageTest extends Scope
             ]
         );
 
-        $this->assertEquals(12, count($response['body']));
+        $this->assertEquals(16, count($response['body']));
         $this->assertEquals(1, count($response['body']['requests']));
         $this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
         $this->validateDates($response['body']['requests']);
@@ -542,7 +542,7 @@ class UsageTest extends Scope
             ]
         );
 
-        $this->assertEquals(12, count($response['body']));
+        $this->assertEquals(16, count($response['body']));
         $this->assertEquals(1, count($response['body']['requests']));
         $this->assertEquals(1, count($response['body']['network']));
         $this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
@@ -774,7 +774,7 @@ class UsageTest extends Scope
         );
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(15, count($response['body']));
+        $this->assertEquals(19, count($response['body']));
         $this->assertEquals('30d', $response['body']['range']);
         $this->assertIsArray($response['body']['deployments']);
         $this->assertIsArray($response['body']['deploymentsStorage']);
@@ -794,15 +794,17 @@ class UsageTest extends Scope
         );
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(17, count($response['body']));
+        $this->assertEquals(21, count($response['body']));
         $this->assertEquals($response['body']['range'], '30d');
         $this->assertIsArray($response['body']['functions']);
         $this->assertIsArray($response['body']['deployments']);
         $this->assertIsArray($response['body']['deploymentsStorage']);
         $this->assertIsArray($response['body']['builds']);
         $this->assertIsArray($response['body']['buildsTime']);
+        $this->assertIsArray($response['body']['buildsMbSeconds']);
         $this->assertIsArray($response['body']['executions']);
         $this->assertIsArray($response['body']['executionsTime']);
+        $this->assertIsArray($response['body']['executionsMbSeconds']);
         $this->assertEquals($executions, $response['body']['executions'][array_key_last($response['body']['executions'])]['value']);
         $this->validateDates($response['body']['executions']);
         $this->assertEquals($executionTime, $response['body']['executionsTime'][array_key_last($response['body']['executionsTime'])]['value']);
diff --git a/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php b/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php
index f72405008d..f58a698452 100644
--- a/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php
+++ b/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php
@@ -92,23 +92,26 @@ class FunctionsConsoleClientTest extends Scope
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);
-        $this->assertEquals(15, count($response['body']));
+        $this->assertEquals(19, count($response['body']));
         $this->assertEquals('24h', $response['body']['range']);
         $this->assertIsNumeric($response['body']['deploymentsTotal']);
         $this->assertIsNumeric($response['body']['deploymentsStorageTotal']);
         $this->assertIsNumeric($response['body']['buildsTotal']);
         $this->assertIsNumeric($response['body']['buildsStorageTotal']);
         $this->assertIsNumeric($response['body']['buildsTimeTotal']);
+        $this->assertIsNumeric($response['body']['buildsMbSecondsTotal']);
         $this->assertIsNumeric($response['body']['executionsTotal']);
         $this->assertIsNumeric($response['body']['executionsTimeTotal']);
+        $this->assertIsNumeric($response['body']['executionsMbSecondsTotal']);
         $this->assertIsArray($response['body']['deployments']);
         $this->assertIsArray($response['body']['deploymentsStorage']);
         $this->assertIsArray($response['body']['builds']);
         $this->assertIsArray($response['body']['buildsTime']);
         $this->assertIsArray($response['body']['buildsStorage']);
-        $this->assertIsArray($response['body']['buildsTime']);
+        $this->assertIsArray($response['body']['buildsMbSeconds']);
         $this->assertIsArray($response['body']['executions']);
         $this->assertIsArray($response['body']['executionsTime']);
+        $this->assertIsArray($response['body']['executionsMbSeconds']);
     }
 
     /**