Work on tests

Signed-off-by: Hendrik Heil <[email protected]>

Author: hendrikheil

src/lib/PubSub/Topic.php

@@ -48,7 +48,7 @@ public function publish(mixed $event, ?array $metadata = null, string $content_t
 
             $event = match(get_class($event)) {
                 'Dapr\PubSub\CloudEvent' => $event->to_array(),
-                'CloudEvents\V1\CloudEvent' => JsonSerializer::create()->serializeStructured($event),
+                'CloudEvents\V1\CloudEvent' => json_decode(JsonSerializer::create()->serializeStructured($event), true),
             };
         }
 

tests/PublishTest.php

@@ -3,6 +3,7 @@
 use Dapr\PubSub\CloudEvent;
 use Dapr\PubSub\Publish;
 use Dapr\PubSub\Topic;
+use CloudEvents\V1\CloudEvent as NewCloudEvent;
 use DI\DependencyException;
 use DI\NotFoundException;
 
@@ -107,6 +108,60 @@ public function testCloudEventPublish()
         );
     }
 
+    /**
+     * @throws DependencyException
+     * @throws NotFoundException
+     */
+    public function testNewCloudEventPublish()
+    {
+        $container = $this->get_http_client_stack([new \GuzzleHttp\Psr7\Response(204)]);
+        $client = $this->get_new_client_with_http($container->client);
+
+        $event = new NewCloudEvent(
+            'id',
+            'source',
+            'type',
+            ['my' => 'event'],
+            'application/json',
+            null,
+            'subject',
+            new DateTimeImmutable('2020-12-12T20:47:00+00:00Z'),
+        );
+
+        $topic = new Topic('pubsub', 'test', $client);
+        $topic->publish($event);
+
+        $publisher = $this->container->make(Publish::class, ['pubsub' => 'pubsub']);
+        $this->get_client()->register_post(
+            '/publish/pubsub/topic',
+            200,
+            null,
+            [
+                'id' => 'id',
+                'source' => 'source',
+                'specversion' => '1.0',
+                'type' => 'type',
+                'datacontenttype' => 'application/json',
+                'subject' => 'subject',
+                'time' => '2020-12-12T20:47:00+00:00Z',
+                'data' => [
+                    'my' => 'event',
+                ],
+            ]
+        );
+        $publisher->topic('topic')->publish($event);
+
+        $request = $container->history[0]['request'];
+        $this->assertRequestMethod('POST', $request);
+        $this->assertRequestUri('/v1.0/publish/pubsub/test', $request);
+        $this->assertRequestQueryString('', $request);
+        $this->assertRequestHasHeaders(['Content-Type' => 'application/cloudevents+json'], $request);
+        $this->assertRequestBody(
+            '{"id":"id","source":"source","specversion":"1.0","type":"type","datacontenttype":"application\/json","subject":"subject","time":"2020-12-12T20:47:00+00:00Z","data":{"my":"event"}}',
+            $request
+        );
+    }
+
     /**
      * @throws Exception
      */