8.1.3 (#13)

Co-authored-by: [email protected] <CircleCI>

Author: pookmish

.circleci/config.yml

@@ -5,76 +5,85 @@ version: 2
 defaults: &defaults
   docker:
     - image: pookmish/drupal8ci:pcov
-    - image: selenium/standalone-chrome:3.141.59-neon
+    - image: selenium/standalone-chrome:latest
     - image: mariadb:10.3
       environment:
         MYSQL_ALLOW_EMPTY_PASSWORD: 1
   working_directory: /var/www/html
 
-
 #Jobs
 code_coverage: &code_coverage
   <<: *defaults
   steps:
     - restore_cache:
         keys:
-          - dependencies-
+          - dependencies-v1
     - checkout:
         path: /var/www/test
     - run:
         name: Run PHP Unit Coverage Tests
         command: |
-          composer global require SU-SWS/stanford-caravan:dev-8.x-1.x
+          composer global require SU-SWS/stanford-caravan:dev-8.x-2.x
           ~/.composer/vendor/bin/sws-caravan phpunit /var/www/html --extension-dir=/var/www/test --with-coverage
     - save_cache:
-        key: dependencies-{{ epoch }}
+        key: dependencies-v1-{{ epoch }}
         paths:
           - .
     - store_test_results:
         path: /var/www/html/artifacts/phpunit
     - store_artifacts:
         path: /var/www/html/artifacts/phpunit/coverage
 
-behat: &behat
+back_to_dev: &back_to_dev
+  <<: *defaults
+  steps:
+    - checkout
+    - run:
+        name: Back to dev
+        command: |
+          composer global require SU-SWS/stanford-caravan:dev-8.x-2.x
+          ~/.composer/vendor/bin/sws-caravan back-to-dev ${CIRCLE_TAG} ${CIRCLE_WORKING_DIRECTORY}
+
+d8_codeception: &d8_codeception
   <<: *defaults
   steps:
-    - restore_cache:
-        keys:
-          - dependencies-
     - checkout:
         path: /var/www/test
     - run:
-        name: Run Behat Tests
+        name: Run Codeception Tests
         command: |
           composer global require SU-SWS/stanford-caravan:dev-8.x-1.x
-          ~/.composer/vendor/bin/sws-caravan behat /var/www/html --extension-dir=/var/www/test
-    - save_cache:
-        key: dependencies-{{ epoch }}
-        paths:
-          - .
+          ~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=/var/www/test
     - store_test_results:
         path: /var/www/html/artifacts/behat
     - store_artifacts:
         path: /var/www/html/artifacts
 
-back_to_dev: &back_to_dev
+d9_codeception: &d9_codeception
   <<: *defaults
   steps:
-    - checkout
+    - checkout:
+        path: /var/www/test
     - run:
-        name: Back to dev
+        name: Run Codeception Tests
         command: |
-          composer global require SU-SWS/stanford-caravan:dev-8.x-1.x
-          ~/.composer/vendor/bin/sws-caravan back-to-dev ${CIRCLE_TAG} ${CIRCLE_WORKING_DIRECTORY}
+          composer global require SU-SWS/stanford-caravan:dev-8.x-2.x
+          ~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=/var/www/test
+    - store_test_results:
+        path: /var/www/html/artifacts/behat
+    - store_artifacts:
+        path: /var/www/html/artifacts
 
 # Declare all of the jobs we should run.
 jobs:
   run-coverage:
     <<: *code_coverage
-  run-behat:
-    <<: *behat
   run-back-to-dev:
     <<: *back_to_dev
+  run-d8-codeception:
+    <<: *d8_codeception
+  run-d9-codeception:
+    <<: *d9_codeception
 
 # Declare a workflow that runs all of our jobs in parallel.
 workflows:
@@ -92,12 +101,12 @@ workflows:
   tests:
     jobs:
       - run-coverage
-      - run-behat
+      - run-d8-codeception
+      - run-d9-codeception
   # Re-test every sunday in case this code becomes stale.
   sundays:
     jobs:
       - run-coverage
-      - run-behat
     triggers:
       - schedule:
           cron: "0 0 * * 0"

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Stanford Fields
 
+8.1.3
+--------------------------------------------------------------------------------
+_Release Date: 2021-01-13_
+
+* Updated phpunit tests to pass in the new year.
+
 8.1.2
 --------------------------------------------------------------------------------
 _Release Date: 2020-04-16_
@@ -13,14 +19,14 @@ _Release Date: 2020-04-16_
 * Update stanford_fields.info.yml (14cad23)
 
 8.x-1.1
---------------------------------------------------------------------------------  
+--------------------------------------------------------------------------------
 _Release Date: 2019-11-19_
 
 - Add form validation to field UI form to prevent the user from entering a field
-name that will generate a hashed table name. 
+name that will generate a hashed table name.
 
 8.x-1.0
---------------------------------------------------------------------------------  
+--------------------------------------------------------------------------------
 _Release Date: 2019-10-30_
 
 - Initial Release

composer.json

@@ -4,7 +4,7 @@
     "type": "drupal-custom-module",
     "homepage": "https://github.com/SU-SWS/stanford_fields",
     "authors": [],
-    "license": "GPL-2.0+",
+    "license": "GPL-2.0-or-later",
     "minimum-stability": "dev",
     "repositories": [
         {

stanford_fields.info.yml

@@ -3,6 +3,6 @@ type: module
 description: 'Field types, widgets and formatters to enhance Drupal and Contrib.'
 core_version_requirement: ^8 || ^9
 package: Stanford
-version: 8.x-1.2
+version: 8.x-1.3
 dependencies:
  - drupal:field

tests/src/Kernel/Plugin/Field/FieldWidget/DateYearOnlyWidgetTest.php

@@ -36,7 +36,7 @@ class DateYearOnlyWidgetTest extends KernelTestBase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $this->installEntitySchema('user');
     $this->installEntitySchema('node');
@@ -88,14 +88,16 @@ public function testWidgetForm() {
     $ten_years = 60 * 60 * 24 * 365 * 10;
     $range = date('Y', time() - $ten_years) . ':' . date('Y', time() + $ten_years);
 
-    $this->assertEqual('datelist', $widget_value['#type']);
-    $this->assertEqual($range, $widget_value['#date_year_range']);
+    $this->assertEquals('datelist', $widget_value['#type']);
+    $this->assertEquals($range, $widget_value['#date_year_range']);
   }
 
   /**
    * Test the settings form and the summary.
    */
   public function testSettingsForm() {
+    $ten_years = 60 * 60 * 24 * 365 * 10;
+
     $field_def = $this->createMock(FieldDefinitionInterface::class);
     $config = [
       'field_definition' => $field_def,
@@ -104,17 +106,15 @@ public function testSettingsForm() {
     ];
     $definition = [];
     $widget = DateYearOnlyWidget::create(\Drupal::getContainer(), $config, '', $definition);
-    $summary = 'Years 2010 to 2030';
-    $this->assertEqual($summary, $widget->settingsSummary()[0]);
+    $summary = sprintf('Years %s to %s', date('Y', time() - $ten_years), date('Y', time() + $ten_years));
+    $this->assertEquals($summary, $widget->settingsSummary()[0]);
 
     $form = [];
     $form_state = new FormState();
     $element = $widget->settingsForm($form, $form_state);
 
-    $ten_years = 60 * 60 * 24 * 365 * 10;
-
-    $this->assertEqual(date('Y', time() - $ten_years), $element['start']['#default_value']);
-    $this->assertEqual(date('Y', time() + $ten_years), $element['end']['#default_value']);
+    $this->assertEquals(date('Y', time() - $ten_years), $element['start']['#default_value']);
+    $this->assertEquals(date('Y', time() + $ten_years), $element['end']['#default_value']);
   }
 
 }

tests/src/Unit/Plugin/Field/FieldFormatter/EntityTitleHeadingTest.php

@@ -35,7 +35,7 @@ class EntityTitleHeadingTest extends FieldFormatterTestBase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $field_definition = $this->createMock(FieldDefinitionInterface::class);
 

tests/src/Unit/Plugin/Field/FieldFormatter/FieldFormatterTestBase.php

@@ -18,7 +18,7 @@ abstract class FieldFormatterTestBase extends UnitTestCase {
   /**
    * {@inheritDoc}
    */
-  protected function setUp() {
+  protected function setUp(): void {
     parent::setUp();
     $path_matcher = $this->createMock(PathMatcherInterface::class);
     $path_matcher->method('isFrontPage')