Update unit tests for d10

SU-SWS · Sep 8, 2023 · 947bc41 · 947bc41
1 parent 25d2354
commit 947bc41
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 22 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
  uses: K-Phoen/semver-release-action@master
  with:
  release_strategy: none
- release_branch: main
+ release_branch: 8.x
  tag_format: "%major%.%minor%.%patch%"
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -32,12 +32,3 @@ jobs:
  commit: ${{ github.sha }}
  generateReleaseNotes: true
  makeLatest: true
- - uses: actions/checkout@v3
- with:
- ref: '9.x'
- fetch-depth: 0
- - name: Back to Dev
- if: ${{ steps.tag.outputs.tag }}
- run: |
- composer global require su-sws/stanford-caravan:dev-8.x-3.x
- ~/.composer/vendor/bin/sws-caravan back-to-dev ${{ steps.tag.outputs.tag }} ${{ github.workspace }} main
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -25,7 +25,7 @@ jobs:
  env:
  CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}}
  run: |
- composer global require su-sws/stanford-caravan:dev-8.x-2.x
+ composer global require su-sws/stanford-caravan:10.x-dev
  ~/.composer/vendor/bin/sws-caravan phpunit /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --with-coverage
  - name: Save Test Results
  uses: actions/upload-artifact@v3
@@ -61,7 +61,7 @@ jobs:
 # path: project
 # - name: Run tests
 # run: |
-# composer global require su-sws/stanford-caravan:dev-8.x-2.x
+# composer global require su-sws/stanford-caravan:10.x-dev
 # ~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --suites=acceptance
 # - name: Save Test Results
 # uses: actions/upload-artifact@v3
@@ -100,7 +100,7 @@ jobs:
 # path: project
 # - name: Run tests
 # run: |
-# composer global require su-sws/stanford-caravan:dev-8.x-2.x
+# composer global require su-sws/stanford-caravan:10.x-dev
 # ~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --suites=functional
 # - name: Save Test Results
 # uses: actions/upload-artifact@v3

diff --git a/tests/src/Kernel/Form/StanfordFieldBookAdminEditFormTest.php b/tests/src/Kernel/Form/StanfordFieldBookAdminEditFormTest.php
@@ -23,7 +23,7 @@ class StanfordFieldBookAdminEditFormTest extends StanfordFieldKernelTestBase {
  /**
  * {@inheritDoc}
  */
- protected function setUp(): void {
+ public function setup(): void {
  parent::setUp();
  \Drupal::service('module_installer')->install(['book']);
 

diff --git a/tests/src/Kernel/Plugin/Block/BookForwardBackBlockTest.php b/tests/src/Kernel/Plugin/Block/BookForwardBackBlockTest.php
@@ -22,7 +22,7 @@ class BookForwardBackBlockTest extends StanfordFieldKernelTestBase {
  /**
  * {@inheritDoc}
  */
- protected function setUp(): void {
+ public function setup(): void {
  parent::setUp();
  \Drupal::service('module_installer')->install(['book']);
 

diff --git a/tests/src/Kernel/Plugin/Field/FieldWidget/DateYearOnlyWidgetTest.php b/tests/src/Kernel/Plugin/Field/FieldWidget/DateYearOnlyWidgetTest.php
@@ -22,7 +22,7 @@ class DateYearOnlyWidgetTest extends StanfordFieldKernelTestBase {
  /**
  * {@inheritDoc}
  */
- protected function setUp(): void {
+ public function setup(): void {
  parent::setUp();
  $field_storage = FieldStorageConfig::create([
  'field_name' => 'field_date',

diff --git a/tests/src/Kernel/Plugin/Field/FieldWidget/LocalistUrlWidgetTest.php b/tests/src/Kernel/Plugin/Field/FieldWidget/LocalistUrlWidgetTest.php
@@ -34,7 +34,7 @@ class LocalistUrlWidgetTest extends StanfordFieldKernelTestBase {
  /**
  * {@inheritDoc}
  */
- protected function setUp(): void {
+ public function setup(): void {
  parent::setUp();
 
  $field_storage = FieldStorageConfig::create([

diff --git a/tests/src/Kernel/Service/FieldCacheTest.php b/tests/src/Kernel/Service/FieldCacheTest.php
@@ -33,7 +33,7 @@ class FieldCacheTest extends StanfordFieldKernelTestBase {
  /**
  * {@inheritDoc}
  */
- protected function setUp(): void {
+ public function setup(): void {
  parent::setUp();
 
  // Create a comment field attached to a host 'entity_test' entity.

diff --git a/tests/src/Kernel/Service/StanfordFieldBookManagerTest.php b/tests/src/Kernel/Service/StanfordFieldBookManagerTest.php
@@ -29,7 +29,7 @@ class StanfordFieldBookManagerTest extends StanfordFieldKernelTestBase {
  /**
  * {@inheritDoc}
  */
- protected function setUp(): void {
+ public function setup(): void {
  parent::setUp();
  \Drupal::service('module_installer')->install(['book']);
 

diff --git a/tests/src/Kernel/StanfordFieldKernelTestBase.php b/tests/src/Kernel/StanfordFieldKernelTestBase.php
@@ -27,7 +27,7 @@ class StanfordFieldKernelTestBase extends KernelTestBase {
  /**
  * {@inheritDoc}
  */
- protected function setUp(): void {
+ public function setup(): void {
  parent::setUp();
  $this->installEntitySchema('user');
  $this->installEntitySchema('node');

diff --git a/tests/src/Unit/Plugin/Field/FieldFormatter/EntityTitleHeadingTest.php b/tests/src/Unit/Plugin/Field/FieldFormatter/EntityTitleHeadingTest.php
@@ -35,7 +35,7 @@ class EntityTitleHeadingTest extends FieldFormatterTestBase {
  /**
  * {@inheritDoc}
  */
- protected function setUp(): void {
+ public function setup(): void {
  parent::setUp();
  $field_definition = $this->createMock(FieldDefinitionInterface::class);
 

diff --git a/tests/src/Unit/Plugin/Field/FieldFormatter/FieldFormatterTestBase.php b/tests/src/Unit/Plugin/Field/FieldFormatter/FieldFormatterTestBase.php
@@ -18,7 +18,7 @@ abstract class FieldFormatterTestBase extends UnitTestCase {
  /**
  * {@inheritDoc}
  */
- protected function setUp(): void {
+ public function setup(): void {
  parent::setUp();
  $path_matcher = $this->createMock(PathMatcherInterface::class);
  $path_matcher->method('isFrontPage')