Skip to content

Commit 090aaf5

Browse files
committed
feat: re-use command logic for functional tests
1 parent fff698b commit 090aaf5

File tree

6 files changed

+28
-15
lines changed

6 files changed

+28
-15
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
declare(strict_types=1);
44

5-
namespace Temporal\Tests\Acceptance\App\Input;
5+
namespace Temporal\Testing;
66

77
final class Command
88
{

tests/Acceptance/App/Runtime/State.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
namespace Temporal\Tests\Acceptance\App\Runtime;
66

7-
use Temporal\Tests\Acceptance\App\Input\Command;
87
use Temporal\DataConverter\PayloadConverterInterface;
8+
use Temporal\Testing\Command;
99

1010
final class State
1111
{

tests/Acceptance/App/RuntimeBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
use PHPUnit\Framework\Attributes\Test;
88
use Temporal\Activity\ActivityInterface;
99
use Temporal\DataConverter\PayloadConverterInterface;
10-
use Temporal\Tests\Acceptance\App\Input\Command;
10+
use Temporal\Testing\Command;
1111
use Temporal\Tests\Acceptance\App\Input\Feature;
1212
use Temporal\Tests\Acceptance\App\Runtime\State;
1313
use Temporal\Worker\FeatureFlags;

tests/Acceptance/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
use Temporal\Client\WorkflowStubInterface;
1919
use Temporal\DataConverter\DataConverter;
2020
use Temporal\DataConverter\DataConverterInterface;
21+
use Temporal\Testing\Command;
2122
use Temporal\Tests\Acceptance\App\Feature\WorkflowStubInjector;
22-
use Temporal\Tests\Acceptance\App\Input\Command;
2323
use Temporal\Tests\Acceptance\App\Runtime\ContainerFacade;
2424
use Temporal\Tests\Acceptance\App\Runtime\RRStarter;
2525
use Temporal\Tests\Acceptance\App\Runtime\State;

tests/Acceptance/worker.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22

33
declare(strict_types=1);
44

5-
use Temporal\Internal\Support\StackRenderer;
6-
use Temporal\Tests\Acceptance\App\Input\Command;
7-
use Temporal\Tests\Acceptance\App\Runtime\Feature;
8-
use Temporal\Tests\Acceptance\App\Runtime\State;
9-
use Temporal\Tests\Acceptance\App\RuntimeBuilder;
105
use Psr\Container\ContainerInterface;
116
use Spiral\Core\Attribute\Proxy;
127
use Spiral\Goridge\RPC\RPC;
@@ -26,6 +21,11 @@
2621
use Temporal\DataConverter\NullConverter;
2722
use Temporal\DataConverter\ProtoConverter;
2823
use Temporal\DataConverter\ProtoJsonConverter;
24+
use Temporal\Internal\Support\StackRenderer;
25+
use Temporal\Testing\Command;
26+
use Temporal\Tests\Acceptance\App\Runtime\Feature;
27+
use Temporal\Tests\Acceptance\App\Runtime\State;
28+
use Temporal\Tests\Acceptance\App\RuntimeBuilder;
2929
use Temporal\Worker\WorkerFactoryInterface;
3030
use Temporal\Worker\WorkerInterface;
3131
use Temporal\WorkerFactory;

tests/Functional/bootstrap.php

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,35 @@
22

33
declare(strict_types=1);
44

5+
use Temporal\Testing\Command;
56
use Temporal\Testing\Environment;
67
use Temporal\Tests\SearchAttributeTestInvoker;
78
use Temporal\Worker\FeatureFlags;
89

9-
chdir(__DIR__ . '/../..');
10+
\chdir(__DIR__ . '/../..');
1011
require_once __DIR__ . '/../../vendor/autoload.php';
1112

1213
$sysInfo = \Temporal\Testing\SystemInfo::detect();
1314

15+
$command = Command::fromEnv();
1416
$environment = Environment::create();
1517
$environment->startTemporalTestServer();
16-
(new SearchAttributeTestInvoker)();
17-
$environment->startRoadRunner(
18-
rrCommand: sprintf('%s serve -c .rr.silent.yaml -w tests/Functional', $sysInfo->rrExecutable),
19-
);
20-
register_shutdown_function(fn() => $environment->stop());
18+
(new SearchAttributeTestInvoker())();
19+
$environment->startRoadRunner(\implode(' ', [
20+
$sysInfo->rrExecutable,
21+
'serve',
22+
'-c', '.rr.silent.yaml',
23+
'-w', 'tests/Functional',
24+
'-o',
25+
'server.command=' . \implode(',', [
26+
PHP_BINARY,
27+
...$command->getPhpBinaryArguments(),
28+
'worker.php',
29+
...$command->getCommandLineArguments(),
30+
]),
31+
]));
32+
33+
\register_shutdown_function(static fn() => $environment->stop());
2134

2235
// Default feature flags
2336
FeatureFlags::$warnOnWorkflowUnfinishedHandlers = false;

0 commit comments

Comments
 (0)