Skip to content

Commit bd0cec2

Browse files
committed
Fix and also run functional tests
1 parent d02cfb5 commit bd0cec2

File tree

4 files changed

+13
-19
lines changed

4 files changed

+13
-19
lines changed

.github/workflows/test-integration.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,13 @@ jobs:
2626
- name: Run CI tests
2727
run: |
2828
cd ci/docker && docker compose exec -T gateway bash -c '
29+
ls -lah /var/www/html/var/cache && \
30+
ls -lah /var/www/html/var/cache/smoketest && \
2931
composer check
3032
'
33+
34+
- name: Output logs on failure
35+
if: failure()
36+
run: |
37+
cd ci/docker
38+
docker compose logs

ci/docker/init.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env bash
22
cp ../../devconf/stepup/gateway/surfnet_yubikey.yaml.dist ../../devconf/stepup/gateway/surfnet_yubikey.yaml
33
echo "pulling the images"
4-
docker compose pull gateway selenium haproxy ssp mariadb
4+
docker compose pull gateway selenium haproxy ssp mariadb chrome
55
echo "starting the images"
6-
docker compose up gateway selenium haproxy ssp mariadb -d
6+
docker compose up gateway selenium haproxy ssp mariadb chrome -d
77
echo "intialising the environment"
88
docker compose exec -T gateway bash -c '
99
cp /var/www/html/devconf/stepup/gateway/surfnet_yubikey.yaml.dist /var/www/html/devconf/stepup/gateway/surfnet_yubikey.yaml && \
@@ -14,5 +14,5 @@ docker compose exec -T gateway bash -c '
1414
composer frontend-install && \global_view_parameters.yaml.dist
1515
./bin/console assets:install --env=smoketest --verbose && \
1616
./bin/console cache:clear --env=smoketest && \
17-
chown -R www-data:www-data /var/www/html/var/
17+
chown -R www-data /var/www/html/var/
1818
'

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@
104104
"@phpcs",
105105
"@phpmd",
106106
"@test",
107-
"@behat"
107+
"@behat",
108+
"@behat-functional"
108109
],
109110
"phplint": "./ci/qa/phplint",
110111
"validate-lockfile": "./ci/qa/validate",

tests/features/bootstrap/ServiceProviderContext.php

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -314,21 +314,6 @@ public function iAuthenticateAtTheIdp($username): void
314314
}
315315
}
316316

317-
/**
318-
* @return IdentityProvider
319-
*/
320-
public function getIdentityProvider()
321-
{
322-
/** @var RequestStack $stack */
323-
324-
$stack = $this->kernel->getContainer()->get('request_stack');
325-
$stack->push(Request::create('https://gateway.dev.openconext.local'));
326-
$ip = $this->kernel->getContainer()->get('surfnet_saml.hosted.identity_provider');
327-
$stack->pop();
328-
329-
return $ip;
330-
}
331-
332317
private static function loadPrivateKey(PrivateKey $key)
333318
{
334319
$keyLoader = new PrivateKeyLoader();

0 commit comments

Comments
 (0)