Updated circleci testing (#111)

Author: pookmish

.circleci/config.yml

@@ -5,7 +5,7 @@ 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
@@ -23,7 +23,7 @@ code_coverage: &code_coverage
     - 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-v1-{{ epoch }}
@@ -41,16 +41,16 @@ back_to_dev: &back_to_dev
     - run:
         name: Back to dev
         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 back-to-dev ${CIRCLE_TAG} ${CIRCLE_WORKING_DIRECTORY}
 
-codeception: &codeception
+d8_codeception: &d8_codeception
   <<: *defaults
   steps:
     - checkout:
         path: /var/www/test
     - run:
-        name: Run Acceptance Tests
+        name: Run Codeception Tests
         command: |
           composer global require SU-SWS/stanford-caravan:dev-8.x-1.x
           ~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=/var/www/test
@@ -59,14 +59,31 @@ codeception: &codeception
     - store_artifacts:
         path: /var/www/html/artifacts
 
+d9_codeception: &d9_codeception
+  <<: *defaults
+  steps:
+    - checkout:
+        path: /var/www/test
+    - run:
+        name: Run Codeception Tests
+        command: |
+          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-back-to-dev:
     <<: *back_to_dev
-  run-codeception:
-    <<: *codeception
+  run-d8-codeception:
+    <<: *d8_codeception
+  run-d9-codeception:
+    <<: *d9_codeception
 
 # Declare a workflow that runs all of our jobs in parallel.
 workflows:
@@ -84,16 +101,16 @@ workflows:
   tests:
     jobs:
       - run-coverage
-      - run-codeception
+      - run-d8-codeception
+      - run-d9-codeception
   # Re-test every sunday in case this code becomes stale.
   sundays:
     jobs:
       - run-coverage
-      - run-codeception
     triggers:
       - schedule:
           cron: "0 0 * * 0"
           filters:
             branches:
               only:
-                - 8.x-2.x
+                - 8.x-1.x

composer.json

@@ -75,7 +75,7 @@
     ],
     "require": {
         "drupal/allowed_formats": "^1.2",
-        "drupal/auto_entitylabel": "3.x-dev#1dd28579f4559cc03d09ab20143b1feb48644fac",
+        "drupal/auto_entitylabel": "^3.0",
         "drupal/ctools": "^3.4",
         "drupal/default_content": "^2.0",
         "drupal/ds": "^3.5",
@@ -86,11 +86,11 @@
         "drupal/field_group": "^3.0",
         "drupal/layout_builder_restrictions": "^2.7",
         "drupal/menu_block": "^1.6",
-        "drupal/page_manager": "dev-4.x#78b492786c841c5d2eb07f6d977275a76b79e46f",
+        "drupal/page_manager": "^4.0",
         "drupal/paragraphs": "^1.11",
         "drupal/pathauto": "^1.8",
         "drupal/rabbit_hole": "^1.0-beta6",
-        "drupal/taxonomy_menu": "dev-3.x#c0892fa9b428ceb784876554c9b80f49d72a246f",
+        "drupal/taxonomy_menu": "dev-3.x",
         "drupal/views_block_filter_block": "^1.0",
         "drupal/views_infinite_scroll": "^1.6",
         "drupal/views_taxonomy_term_name_depth": "^7.0",

stanford_news.module

@@ -25,10 +25,6 @@ function stanford_news_theme() {
       'template' => 'field/field--node--su-news-topics',
       'base hook' => 'field',
     ],
-    'field__node__su_news_dek' => [
-      'template' => 'field/field--node--su-news-dek--stanford-news',
-      'base hook' => 'field',
-    ],
     'signup_block' => [
       'variables' => [
         'form_action' => NULL,
@@ -42,6 +38,15 @@ function stanford_news_theme() {
   ];
 }
 
+/**
+ * Implements hook_preprocess_HOOK().
+ */
+function stanford_news_preprocess_field__su_news_dek(&$variables) {
+  $variables['attributes']['class'][] = 'flex-12-of-12';
+  $variables['attributes']['class'][] = 'flex-md-10-of-12';
+  $variables['attributes']['class'][] = 'flex-xl-7-of-12';
+}
+
 /**
  * Implements hook_preprocess_block().
  */