diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ce04112..b285a49 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,6 +9,9 @@ on: env: DRUPAL_TESTING_TEST_CODING_STYLES: false DRUPAL_TESTING_PROJECT_BASEDIR: ${{ github.workspace }}/tests/module + DRUPAL_TESTING_DATABASE_USER: root + DRUPAL_TESTING_DATABASE_PASSWORD: root + DRUPAL_TESTING_DATABASE_ENGINE: mysql jobs: test-projects: @@ -17,20 +20,20 @@ jobs: strategy: matrix: - RUN: [1, 2, 3, 4] + RUN: [1, 2, 3, 4, 5] include: - RUN: 1 - DRUPAL_TESTING_COMPOSER_PROJECT: 'drupal/recommended-project' DRUPAL_TESTING_DRUPAL_VERSION: '~8.7.0' - RUN: 2 DRUPAL_TESTING_COMPOSER_PROJECT: 'drupal/recommended-project' - RUN: 3 - DRUPAL_TESTING_COMPOSER_PROJECT: 'drupal/recommended-project' DRUPAL_TESTING_DRUPAL_VERSION: '~8.8.0' DRUPAL_TESTING_MIN_BUILD: true - RUN: 4 DRUPAL_TESTING_COMPOSER_PROJECT: 'thunder/thunder-project' DRUPAL_TESTING_DRUPAL_VERSION: '~8.8.0' + - RUN: 5 + DRUPAL_TESTING_DRUPAL_VERSION: '~9.0' steps: - uses: actions/checkout@v1 @@ -40,6 +43,10 @@ jobs: coverage: none php-version: '7.3' + - name: Start MySql service + run: | + sudo /etc/init.d/mysql start + - name: Cache composer dependencies uses: actions/cache@v1 with: @@ -71,6 +78,10 @@ jobs: coverage: none php-version: '7.3' + - name: Start MySql service + run: | + sudo /etc/init.d/mysql start + - name: Cache composer dependencies uses: actions/cache@v1 with: @@ -93,7 +104,7 @@ jobs: echo "::add-path::$GITHUB_WORKSPACE/bin" - name: Install project - run: test-drupal-project install + run: test-drupal-project install - name: Zip build run: cd /tmp; tar cfz build.tgz test; mv build.tgz ${GITHUB_WORKSPACE} @@ -118,6 +129,10 @@ jobs: php-version: '7.3' extensions: Imagick + - name: Start MySql service + run: | + sudo /etc/init.d/mysql start + - name: Setup environment variables run: | echo "::add-path::$HOME/.composer/vendor/bin" diff --git a/lib/stages/prepare_build.sh b/lib/stages/prepare_build.sh index 8afde82..d3f0e84 100644 --- a/lib/stages/prepare_build.sh +++ b/lib/stages/prepare_build.sh @@ -32,7 +32,7 @@ _stage_prepare_build() { composer require oomphinc/composer-installers-extender --no-update --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}" fi - composer require drush/drush:"^9" --no-update --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}" + composer require drush/drush:"^9||>=10.2.2" --no-update --working-dir="${DRUPAL_TESTING_DRUPAL_INSTALLATION_DIRECTORY}" # Require phpstan. if ${DRUPAL_TESTING_TEST_DEPRECATION}; then diff --git a/tests/module/tests/FunctionalJavascript/ModuleControllerTest.php b/tests/module/tests/FunctionalJavascript/ModuleControllerTest.php index 3f8b0d1..4a0a91f 100644 --- a/tests/module/tests/FunctionalJavascript/ModuleControllerTest.php +++ b/tests/module/tests/FunctionalJavascript/ModuleControllerTest.php @@ -18,6 +18,11 @@ class ModuleControllerTest extends WebDriverTestBase { */ protected static $modules = ['module']; + /** + * {@inheritdoc} + */ + protected $defaultTheme = 'stark'; + /** * {@inheritdoc} */