diff options
| author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2020-07-06 09:56:26 +0300 |
|---|---|---|
| committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2020-07-06 09:59:21 +0300 |
| commit | 2b945ad0fd5e1f8133e7ec8e580da6a408fbcaa5 (patch) | |
| tree | 89eae81fbd427584dbd752588b84b541a46f66d1 /build.xml | |
| parent | f6424a3d444cca7945d6b5695dddf840f2c49e74 (diff) | |
.......... [DEV-1560] added autotests for the SAML authentication settings form
* commit 'dadd0b9d4809efccbecdb2580a027b4404bb2584':
.......... [DEV-1560] added configuration parameters for SAML tests
.......... [DEV-1560] added configuration parameters for SAML tests
.......... [DEV-1560] added configuration parameters for SAML tests
.......... [DEV-1560] added configuration parameters for SAML tests
.......... [DEV-1560] fixes as per review comments
.......... [DEV-1560] added configureSamlAuthentication method description
.......... [DEV-1560] added scenario for authentication via SAML
.......... [DEV-1560] fixes according to review comments except for adding scenario foruser authentication
.......... [DEV-1560] added missing checks as per review comments
.......... [DEV-1560] created new autotest form SAML authentication settings form
(cherry picked from commit d2ffb2598d92a2d95638bf338f2002b4c852c56b)
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/build.xml b/build.xml index 364302674b0..38bb9b2a567 100644 --- a/build.xml +++ b/build.xml @@ -20,9 +20,9 @@ <property name="dbhost" value="${DBHOST}"/> <property name="dbname" value="${DBNAME}"/> <property name="dbuser" value="${DBUSER}"/> - <property name="dbpassword" value="${DBPASSWORD}"/> - <property name="phpunit_error_log" value="${PHPUNIT_ERROR_LOG}"/> - <property name="phpunit_port_prefix" value="${PHPUNIT_PORT_PREFIX}"/> + <property name="dbpassword" value="${DBPASSWORD}"/> + <property name="phpunit_error_log" value="${PHPUNIT_ERROR_LOG}"/> + <property name="phpunit_port_prefix" value="${PHPUNIT_PORT_PREFIX}"/> <property name="screenshot_references_dir" value="${SCREENSHOT_REFERENCES_DIR}"/> <condition property="phpunit_driver_address" value="${PHPUNIT_DRIVER_ADDRESS}" else="localhost"> <and> @@ -31,6 +31,8 @@ </and> </condition> <property environment="env"/> + <property name="phpunit_simplesaml_baseurl" value="${PHPUNIT_SIMPLESAML_BASEURL}"/> + <property name="phpunit_sp_entity_id" value="${PHPUNIT_SP_ENTITY_ID}"/> <!-- Create bootstrap.php --> <copy overwrite="true" file="ui/tests/bootstrap.php.template" tofile="ui/tests/bootstrap.php"/> @@ -45,6 +47,14 @@ <replace file="ui/tests/bootstrap.php" token="{PORT_PREFIX}" value="${phpunit_port_prefix}"/> <replace file="ui/tests/bootstrap.php" token="{SCREENSHOT_REFERENCES_DIR}" value="${screenshot_references_dir}"/> <replace file="ui/tests/bootstrap.php" token="{PHPUNIT_DRIVER_ADDRESS}" value="${phpunit_driver_address}"/> + <!-- SAML settings --> + <replace file="ui/tests/bootstrap.php" token="'PHPUNIT_SAML_TESTS_ENABLED', false" value="'PHPUNIT_SAML_TESTS_ENABLED', true"/> + <replace file="ui/tests/bootstrap.php" token="{PHPUNIT_IDP_ENTITY_ID}" value="${phpunit_simplesaml_baseurl}/saml2/idp/metadata.php"/> + <replace file="ui/tests/bootstrap.php" token="{PHPUNIT_SSO_SERVICE_URL}" value="${phpunit_simplesaml_baseurl}/saml2/idp/SSOService.php"/> + <replace file="ui/tests/bootstrap.php" token="{PHPUNIT_SLO_SERVICE_URL}" value="${phpunit_simplesaml_baseurl}/saml2/idp/SingleLogoutService.php"/> + <replace file="ui/tests/bootstrap.php" token="{PHPUNIT_SP_ENTITY_ID}" value="${phpunit_sp_entity_id}"/> + <!-- Download SAML X509 certificates --> + <get src="${phpunit_simplesaml_baseurl}/module.php/saml/idp/certs.php/idp.crt" dest="ui/conf/certs"/> <!-- Create PHP config file --> <copy overwrite="true" file="ui/tests/templates/zabbix.conf.php" tofile="ui/conf/zabbix.conf.php"/> |