Skip to content

Commit 06d9e5e

Browse files
author
Alexander Miertsch
authored
Merge pull request #28 from prooph/fixtests
fix load stream test
2 parents 6a0645d + 722ac9c commit 06d9e5e

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

composer.json.dist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"require": {
2727
"php": "^7.1",
2828
"psr/container": "^1.0",
29-
"prooph/event-store" : "^7.2",
30-
"prooph/pdo-event-store": "^1.3.3",
29+
"prooph/event-store" : "^7.2.1",
30+
"prooph/pdo-event-store": "^1.4.1",
3131
"roave/security-advisories": "dev-master",
3232
"sandrokeil/interop-config": "^2.1",
3333
"zendframework/zend-config-aggregator": "^1.0",

tests/integration/AbstractHttpApiServerTestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,6 @@ protected function createReadModelProjection(): void
238238

239239
protected function waitForProjectionsToStart(): void
240240
{
241-
usleep(100000);
241+
usleep(200000);
242242
}
243243
}

tests/unit/Action/LoadStreamTest.php

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -154,19 +154,19 @@ public function it_loads_events(): void
154154
$urlHelper = $this->prophesize(UrlHelper::class);
155155
$urlHelper->generate('EventStore::load', [
156156
'streamname' => 'foo',
157-
])->willReturn('/streams/foo')->shouldBeCalled();
157+
])->willReturn('/stream/foo')->shouldBeCalled();
158158
$urlHelper->generate('EventStore::load', [
159159
'streamname' => 'foo',
160160
'start' => '1',
161161
'direction' => 'forward',
162162
'count' => 3,
163-
])->willReturn('/streams/foo/1/forward/3')->shouldBeCalled();
163+
])->willReturn('/stream/foo/1/forward/3')->shouldBeCalled();
164164
$urlHelper->generate('EventStore::load', [
165165
'streamname' => 'foo',
166166
'start' => 'head',
167167
'direction' => 'backward',
168168
'count' => 3,
169-
])->willReturn('/streams/foo/head/backward/3')->shouldBeCalled();
169+
])->willReturn('/stream/foo/head/backward/3')->shouldBeCalled();
170170

171171
$delegate = $this->prophesize(DelegateInterface::class);
172172

@@ -184,19 +184,19 @@ public function it_loads_events(): void
184184

185185
$expected = [
186186
'title' => 'Event stream \'foo\'',
187-
'id' => 'http://localhost:8080/streams/foo',
187+
'id' => 'http://localhost:8080/stream/foo',
188188
'streamName' => 'foo',
189189
'_links' => [
190190
[
191-
'uri' => 'http://localhost:8080/streams/foo',
191+
'uri' => 'http://localhost:8080/stream/foo',
192192
'relation' => 'self',
193193
],
194194
[
195-
'uri' => 'http://localhost:8080/streams/foo/1/forward/3',
195+
'uri' => 'http://localhost:8080/stream/foo/1/forward/3',
196196
'relation' => 'first',
197197
],
198198
[
199-
'uri' => 'http://localhost:8080/streams/foo/head/backward/3',
199+
'uri' => 'http://localhost:8080/stream/foo/head/backward/3',
200200
'relation' => 'last',
201201
],
202202
],
@@ -291,19 +291,19 @@ public function it_load_events_reverse(): void
291291
$urlHelper = $this->prophesize(UrlHelper::class);
292292
$urlHelper->generate('EventStore::load', [
293293
'streamname' => 'foo',
294-
])->willReturn('/streams/foo')->shouldBeCalled();
294+
])->willReturn('/stream/foo')->shouldBeCalled();
295295
$urlHelper->generate('EventStore::load', [
296296
'streamname' => 'foo',
297297
'start' => '1',
298298
'direction' => 'forward',
299299
'count' => 3,
300-
])->willReturn('/streams/foo/1/forward/3')->shouldBeCalled();
300+
])->willReturn('/stream/foo/1/forward/3')->shouldBeCalled();
301301
$urlHelper->generate('EventStore::load', [
302302
'streamname' => 'foo',
303303
'start' => 'head',
304304
'direction' => 'backward',
305305
'count' => 3,
306-
])->willReturn('/streams/foo/head/backward/3')->shouldBeCalled();
306+
])->willReturn('/stream/foo/head/backward/3')->shouldBeCalled();
307307

308308
$delegate = $this->prophesize(DelegateInterface::class);
309309

@@ -321,19 +321,19 @@ public function it_load_events_reverse(): void
321321

322322
$expected = [
323323
'title' => 'Event stream \'foo\'',
324-
'id' => 'http://localhost:8080/streams/foo',
324+
'id' => 'http://localhost:8080/stream/foo',
325325
'streamName' => 'foo',
326326
'_links' => [
327327
[
328-
'uri' => 'http://localhost:8080/streams/foo',
328+
'uri' => 'http://localhost:8080/stream/foo',
329329
'relation' => 'self',
330330
],
331331
[
332-
'uri' => 'http://localhost:8080/streams/foo/1/forward/3',
332+
'uri' => 'http://localhost:8080/stream/foo/1/forward/3',
333333
'relation' => 'first',
334334
],
335335
[
336-
'uri' => 'http://localhost:8080/streams/foo/head/backward/3',
336+
'uri' => 'http://localhost:8080/stream/foo/head/backward/3',
337337
'relation' => 'last',
338338
],
339339
],
@@ -504,19 +504,19 @@ public function it_returns_only_matched_metadata_and_properties_on_load(): void
504504
$urlHelper = $this->prophesize(UrlHelper::class);
505505
$urlHelper->generate('EventStore::load', [
506506
'streamname' => 'foo',
507-
])->willReturn('/streams/foo')->shouldBeCalled();
507+
])->willReturn('/stream/foo')->shouldBeCalled();
508508
$urlHelper->generate('EventStore::load', [
509509
'streamname' => 'foo',
510510
'start' => '1',
511511
'direction' => 'forward',
512512
'count' => 3,
513-
])->willReturn('/streams/foo/1/forward/3')->shouldBeCalled();
513+
])->willReturn('/stream/foo/1/forward/3')->shouldBeCalled();
514514
$urlHelper->generate('EventStore::load', [
515515
'streamname' => 'foo',
516516
'start' => 'head',
517517
'direction' => 'backward',
518518
'count' => 3,
519-
])->willReturn('/streams/foo/head/backward/3')->shouldBeCalled();
519+
])->willReturn('/stream/foo/head/backward/3')->shouldBeCalled();
520520

521521
$delegate = $this->prophesize(DelegateInterface::class);
522522

@@ -534,19 +534,19 @@ public function it_returns_only_matched_metadata_and_properties_on_load(): void
534534

535535
$expected = [
536536
'title' => 'Event stream \'foo\'',
537-
'id' => 'http://localhost:8080/streams/foo',
537+
'id' => 'http://localhost:8080/stream/foo',
538538
'streamName' => 'foo',
539539
'_links' => [
540540
[
541-
'uri' => 'http://localhost:8080/streams/foo',
541+
'uri' => 'http://localhost:8080/stream/foo',
542542
'relation' => 'self',
543543
],
544544
[
545-
'uri' => 'http://localhost:8080/streams/foo/1/forward/3',
545+
'uri' => 'http://localhost:8080/stream/foo/1/forward/3',
546546
'relation' => 'first',
547547
],
548548
[
549-
'uri' => 'http://localhost:8080/streams/foo/head/backward/3',
549+
'uri' => 'http://localhost:8080/stream/foo/head/backward/3',
550550
'relation' => 'last',
551551
],
552552
],
@@ -628,19 +628,19 @@ public function it_returns_only_matched_metadata_and_properties_on_load_reverse(
628628
$urlHelper = $this->prophesize(UrlHelper::class);
629629
$urlHelper->generate('EventStore::load', [
630630
'streamname' => 'foo',
631-
])->willReturn('/streams/foo')->shouldBeCalled();
631+
])->willReturn('/stream/foo')->shouldBeCalled();
632632
$urlHelper->generate('EventStore::load', [
633633
'streamname' => 'foo',
634634
'start' => '1',
635635
'direction' => 'forward',
636636
'count' => 3,
637-
])->willReturn('/streams/foo/1/forward/3')->shouldBeCalled();
637+
])->willReturn('/stream/foo/1/forward/3')->shouldBeCalled();
638638
$urlHelper->generate('EventStore::load', [
639639
'streamname' => 'foo',
640640
'start' => 'head',
641641
'direction' => 'backward',
642642
'count' => 3,
643-
])->willReturn('/streams/foo/head/backward/3')->shouldBeCalled();
643+
])->willReturn('/stream/foo/head/backward/3')->shouldBeCalled();
644644

645645
$delegate = $this->prophesize(DelegateInterface::class);
646646

@@ -658,19 +658,19 @@ public function it_returns_only_matched_metadata_and_properties_on_load_reverse(
658658

659659
$expected = [
660660
'title' => 'Event stream \'foo\'',
661-
'id' => 'http://localhost:8080/streams/foo',
661+
'id' => 'http://localhost:8080/stream/foo',
662662
'streamName' => 'foo',
663663
'_links' => [
664664
[
665-
'uri' => 'http://localhost:8080/streams/foo',
665+
'uri' => 'http://localhost:8080/stream/foo',
666666
'relation' => 'self',
667667
],
668668
[
669-
'uri' => 'http://localhost:8080/streams/foo/1/forward/3',
669+
'uri' => 'http://localhost:8080/stream/foo/1/forward/3',
670670
'relation' => 'first',
671671
],
672672
[
673-
'uri' => 'http://localhost:8080/streams/foo/head/backward/3',
673+
'uri' => 'http://localhost:8080/stream/foo/head/backward/3',
674674
'relation' => 'last',
675675
],
676676
],

0 commit comments

Comments
 (0)