fix: update tests to meet new requirements

Author: aawnu

test/Unit/AnalyticsTest.php

@@ -6,6 +6,7 @@
 use AlexWestergaard\PhpGa4\Facade;
 use AlexWestergaard\PhpGa4\Event;
 use AlexWestergaard\PhpGa4\Analytics;
+use AlexWestergaard\PhpGa4\Event\Login;
 use AlexWestergaard\PhpGa4Test\TestCase;
 
 final class AnalyticsTest extends TestCase
@@ -17,7 +18,6 @@ public function test_can_configure_and_export()
             $this->prefill['api_secret'],
             $debug = true
         )
-            ->setNonPersonalizedAds($nonPersonalisedAds = true)
             ->setClientId($this->prefill['client_id'])
             ->setUserId($this->prefill['user_id'])
             ->setTimestampMicros($time = time())
@@ -27,7 +27,6 @@ public function test_can_configure_and_export()
         $asArray = $analytics->toArray();
         $this->assertIsArray($asArray);
 
-        $this->assertArrayHasKey('non_personalized_ads', $asArray);
         $this->assertArrayHasKey('timestamp_micros', $asArray);
         $this->assertArrayHasKey('client_id', $asArray);
         $this->assertArrayHasKey('user_id', $asArray);
@@ -36,7 +35,6 @@ public function test_can_configure_and_export()
 
         $timeAsMicro = $time * 1_000_000;
 
-        $this->assertEquals($nonPersonalisedAds, $asArray['non_personalized_ads']);
         $this->assertEquals($timeAsMicro, $asArray['timestamp_micros']);
         $this->assertEquals($this->prefill['client_id'], $asArray['client_id']);
         $this->assertEquals($this->prefill['user_id'], $asArray['user_id']);
@@ -46,7 +44,7 @@ public function test_can_configure_and_export()
 
     public function test_can_post_to_google()
     {
-        $this->assertNull($this->analytics->post());
+        $this->assertNull($this->analytics->addEvent(Login::new())->post());
     }
 
     public function test_converts_to_full_microtime_stamp()
@@ -68,6 +66,8 @@ public function test_throws_if_microtime_older_than_three_days()
 
     public function test_exports_userproperty_to_array()
     {
+        $this->analytics->addEvent(Login::new());
+        
         $userProperty = UserProperty::new()
             ->setName('customer_tier')
             ->setValue('premium');
@@ -138,7 +138,7 @@ public function test_throws_on_too_large_request_package()
             $userProperty->setValue($overflowValue);
         }
 
-        $this->analytics->addUserProperty($userProperty)->post();
+        $this->analytics->addEvent(Login::new())->addUserProperty($userProperty)->post();
     }
 
     public function test_timeasmicro_throws_exceeding_max()

test/Unit/ConsentTest.php

@@ -2,20 +2,25 @@
 
 namespace AlexWestergaard\PhpGa4Test\Unit;
 
+use AlexWestergaard\PhpGa4\Event\Login;
 use AlexWestergaard\PhpGa4\Helper\ConsentHelper;
 use AlexWestergaard\PhpGa4Test\TestCase;
 
 final class ConsentTest extends TestCase
 {
     public function test_no_consent_is_empty()
     {
+        $this->analytics->addEvent(Login::new());
+
         $export = $this->analytics->consent()->toArray();
         $this->assertIsArray($export);
         $this->assertCount(0, $export);
     }
 
     public function test_consent_ad_user_data_granted()
     {
+        $this->analytics->addEvent(Login::new());
+
         $this->analytics->consent()->setAdUserDataPermission(true);
 
         $export = $this->analytics->consent()->toArray();
@@ -28,6 +33,8 @@ public function test_consent_ad_user_data_granted()
 
     public function test_consent_ad_personalization_granted()
     {
+        $this->analytics->addEvent(Login::new());
+
         $this->analytics->consent()->setAdPersonalizationPermission(true);
 
         $export = $this->analytics->consent()->toArray();
@@ -40,6 +47,8 @@ public function test_consent_ad_personalization_granted()
 
     public function test_consent_granted()
     {
+        $this->analytics->addEvent(Login::new());
+
         $this->analytics->consent()->setAdUserDataPermission(true);
         $this->analytics->consent()->setAdPersonalizationPermission(true);
 
@@ -54,6 +63,8 @@ public function test_consent_granted()
 
     public function test_consent_granted_posted()
     {
+        $this->analytics->addEvent(Login::new());
+
         $this->analytics->consent()->setAdUserDataPermission(true);
         $this->analytics->consent()->setAdPersonalizationPermission(true);
 
@@ -69,6 +80,8 @@ public function test_consent_granted_posted()
 
     public function test_consent_ad_user_data_denied()
     {
+        $this->analytics->addEvent(Login::new());
+
         $this->analytics->consent()->setAdUserDataPermission(false);
 
         $export = $this->analytics->consent()->toArray();
@@ -81,6 +94,8 @@ public function test_consent_ad_user_data_denied()
 
     public function test_consent_ad_personalization_denied()
     {
+        $this->analytics->addEvent(Login::new());
+
         $this->analytics->consent()->setAdPersonalizationPermission(false);
 
         $export = $this->analytics->consent()->toArray();
@@ -93,6 +108,8 @@ public function test_consent_ad_personalization_denied()
 
     public function test_consent_denied()
     {
+        $this->analytics->addEvent(Login::new());
+
         $this->analytics->consent()->setAdUserDataPermission(false);
         $this->analytics->consent()->setAdPersonalizationPermission(false);
 
@@ -107,6 +124,8 @@ public function test_consent_denied()
 
     public function test_consent_denied_posted()
     {
+        $this->analytics->addEvent(Login::new());
+
         $this->analytics->consent()->setAdUserDataPermission(false);
         $this->analytics->consent()->setAdPersonalizationPermission(false);