Skip to content

Commit 8165039

Browse files
committed
Fix tests
1 parent b6940af commit 8165039

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

test/Process/DockerProcessFactoryTest.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function testCreate(): void
3939

4040
$process = $factory->create($input);
4141
$cmd = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
42-
$cmd .= " 'run' '--rm' '-w' '/solution' 'runtime' 'php'";
42+
$cmd .= " 'run' '--user' '" . getmyuid() . ":" . getmygid() . "' '--rm' '-e' 'COMPOSER_HOME=/tmp/composer' '-w' '/solution' 'runtime' 'php'";
4343
static::assertSame($cmd, $process->getCommandLine());
4444
static::assertSame('/docker-dir', $process->getWorkingDirectory());
4545
}
@@ -57,7 +57,7 @@ public function testCreateMountsComposerCacheDirIfExecutableIsComposer(): void
5757

5858
$process = $factory->create($input);
5959
$cmd = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
60-
$cmd .= " 'run' '--rm' '-w' '/solution' '-v' '/composer/cache/dir:/root/.composer/cache' 'runtime' 'composer'";
60+
$cmd .= " 'run' '--user' '" . getmyuid() . ":" . getmygid() . "' '--rm' '-e' 'COMPOSER_HOME=/tmp/composer' '-w' '/solution' '-v' '/composer/cache/dir:/tmp/composer' 'runtime' 'composer'";
6161
static::assertSame($cmd, $process->getCommandLine());
6262
static::assertSame('/docker-dir', $process->getWorkingDirectory());
6363
}
@@ -75,7 +75,7 @@ public function testCreateWithArgs(): void
7575

7676
$process = $factory->create($input);
7777
$cmd = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
78-
$cmd .= " 'run' '--rm' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
78+
$cmd .= " 'run' '--user' '" . getmyuid() . ":" . getmygid() . "' '--rm' '-e' 'COMPOSER_HOME=/tmp/composer' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
7979
static::assertSame($cmd, $process->getCommandLine());
8080
static::assertSame('/docker-dir', $process->getWorkingDirectory());
8181
}
@@ -93,7 +93,7 @@ public function testCreateWithEnv(): void
9393

9494
$process = $factory->create($input);
9595
$cmd = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
96-
$cmd .= " 'run' '--rm' '-e' 'SOME_VAR=value' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
96+
$cmd .= " 'run' '--user' '" . getmyuid() . ":" . getmygid() . "' '--rm' '-e' 'SOME_VAR=value' '-e' 'COMPOSER_HOME=/tmp/composer' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
9797
static::assertSame($cmd, $process->getCommandLine());
9898
static::assertSame('/docker-dir', $process->getWorkingDirectory());
9999
}
@@ -111,7 +111,7 @@ public function testWithInput(): void
111111

112112
$process = $factory->create($input);
113113
$cmd = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
114-
$cmd .= " 'run' '--rm' '-w' '/solution' 'runtime' 'php'";
114+
$cmd .= " 'run' '--user' '" . getmyuid() . ":" . getmygid() . "' '--rm' '-e' 'COMPOSER_HOME=/tmp/composer' '-w' '/solution' 'runtime' 'php'";
115115
static::assertSame($cmd, $process->getCommandLine());
116116
static::assertSame('someinput', $process->getInput());
117117
}
@@ -129,9 +129,9 @@ public function testSolutionDirectoryIsPassedAsEnvVar(): void
129129

130130
$process = $factory->create($input);
131131
$cmd = "'/usr/local/bin/docker' 'compose' '-p' 'php8appreciate' '-f' '.docker/runtime/docker-compose.yml'";
132-
$cmd .= " 'run' '--rm' '-e' 'SOME_VAR=value' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
132+
$cmd .= " 'run' '--user' '" . getmyuid() . ":" . getmygid() . "' '--rm' '-e' 'SOME_VAR=value' '-e' 'COMPOSER_HOME=/tmp/composer' '-w' '/solution' 'runtime' 'php' 'one' 'two'";
133133
static::assertSame($cmd, $process->getCommandLine());
134134
static::assertSame('/docker-dir', $process->getWorkingDirectory());
135-
static::assertSame(['SOLUTION' => __DIR__], $process->getEnv());
135+
static::assertSame(['SOLUTION' => __DIR__, 'UID' => getmyuid(), 'GID' => getmygid()], $process->getEnv());
136136
}
137137
}

0 commit comments

Comments
 (0)