diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bbdf4c6fc0d9da0b5cf677f1cd31f42dea324f48..a4d480111b33701c1f5cd7785d3f506e883a7b21 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ variables: # Configure mysql service (https://hub.docker.com/_/mysql/) MYSQL_DATABASE: wordpress_tests MYSQL_ROOT_PASSWORD: mysql + WP_VERSION: latest cache: paths: @@ -10,7 +11,7 @@ cache: before_script: # Set up WordPress tests - - bash bin/install-wp-tests.sh $MYSQL_DATABASE root $MYSQL_ROOT_PASSWORD mysql latest true + - bash bin/install-wp-tests.sh $MYSQL_DATABASE root $MYSQL_ROOT_PASSWORD mysql $WP_VERSION true # PHPUnit - | @@ -22,6 +23,8 @@ before_script: PHPunit:PHP5.3:MySQL: stage: test + variables: + WP_VERSION: 5.1.1 image: containers.ethitter.com:443/docker/images/php:5.3 services: - mysql:5.6 diff --git a/tests/bootstrap.php b/tests/bootstrap.php index f75308951b74aed1523bf7d8e90be1dac897a958..64e9b989474adbc19f6ff29207308a53fa076f5a 100755 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -26,7 +26,7 @@ function _manually_load_plugin() { // Plugin requires a permalink structure to operate. _set_default_permalink_structure_for_tests(); - require dirname( __FILE__, 2 ) . '/eth-simple-shortlinks.php'; + require dirname( dirname( __FILE__ ) ) . '/eth-simple-shortlinks.php'; } tests_add_filter( 'muplugins_loaded', '_manually_load_plugin' );