From 27fa309b06675fbffe40219f932e5f17f184dbaa Mon Sep 17 00:00:00 2001
From: Rosie Le Faive <lefaive@gmail.com>
Date: Thu, 21 Jul 2022 09:21:16 -0300
Subject: [PATCH] Remove future versions we're not ready for.
---
.github/workflows/build-2.x.yml | 16 +++++-----------
.../Functional/IslandoraFunctionalTestBase.php | 9 ++++++---
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/.github/workflows/build-2.x.yml b/.github/workflows/build-2.x.yml
index 1bd91b99..fad82be8 100644
--- a/.github/workflows/build-2.x.yml
+++ b/.github/workflows/build-2.x.yml
@@ -23,19 +23,13 @@ jobs:
strategy:
fail-fast: false
matrix:
- php-versions: ["7.4", "8.0", "8.1"]
+ php-versions: ["7.4", "8.0"]
+ # PHP 8.1 fails - see https://github.com/Islandora/islandora/issues/887
test-suite: ["kernel", "functional", "functional-javascript"]
- drupal-version: ["9.3.x", "9.4.x", "9.5.x-dev", "10.0.x-dev"]
+ drupal-version: ["9.3.x", "9.4.x", "9.5.x-dev"]
+ # Not yet Drupal 10 ready - see https://github.com/Islandora/islandora/issues/888
mysql: ["8.0"]
- include:
- - allowed_failure: false
- - php-versions: "8.1"
- allowed_failure: true
- exclude:
- - php-versions: "7.4"
- drupal-version: "10.0.x-dev"
- - php-versions: "8.0"
- drupal-version: "10.0.x-dev"
+ allowed_failure: [false]
name: PHP ${{ matrix.php-versions }} | drupal ${{ matrix.drupal-version }} | mysql ${{ matrix.mysql }} | test-suite ${{ matrix.test-suite }}
diff --git a/tests/src/Functional/IslandoraFunctionalTestBase.php b/tests/src/Functional/IslandoraFunctionalTestBase.php
index c154c5c2..1d970b5a 100644
--- a/tests/src/Functional/IslandoraFunctionalTestBase.php
+++ b/tests/src/Functional/IslandoraFunctionalTestBase.php
@@ -278,11 +278,13 @@ EOD;
* Creates a test context.
*/
protected function createContext($label, $name) {
- $this->drupalPostForm('admin/structure/context/add', [
+ $this->drupalGet('admin/structure/context/add');
+ $values = [
'label' => $label,
'name' => $name,
- ],
- $this->t('Save'));
+ ];
+ $this->submitForm($values, 'Save');
+
$this->assertSession()->statusCodeEquals(200);
}
@@ -455,3 +457,4 @@ EOD;
}
}
+