Merge pull request #188 from cboyden-ucb/update-core-8.5

Update Drupal core and patches for 8.5.4

.probo.yaml

@@ -10,8 +10,8 @@ steps:
     script:
       - cp -r $SRC_DIR /sitefarm_seed ; mv /sitefarm_seed $SRC_DIR/sitefarm_seed
       - cd $SRC_DIR/sitefarm_seed ; git init ; git config user.email "[email protected]" ; git config user.name "Probo CI" ; git add -A ; git commit -m "$COMMIT_REF" -q
-      - if [ $(git ls-remote --heads git@github.com:ucdavis/sitefarm-distro-template.git $BRANCH_NAME | wc -l) = 1 ]; then BRANCH="$BRANCH_NAME"; else BRANCH=master; fi
-      - cd $SRC_DIR ; git clone --branch $BRANCH git@github.com:ucdavis/sitefarm-distro-template.git
+      - if [ $(git ls-remote --heads https://github.com/ucdavis/sitefarm-distro-template.git $BRANCH_NAME | wc -l) = 1 ]; then BRANCH="$BRANCH_NAME"; else BRANCH=master; fi
+      - cd $SRC_DIR ; git clone --branch $BRANCH https://github.com/ucdavis/sitefarm-distro-template.git
       - cd sitefarm-distro-template ; composer self-update ; composer global update
       - git apply $ASSET_DIR/sitefarm_seed_local.patch
       - composer install --ansi
@@ -38,18 +38,14 @@ steps:
   - name: Run Behat JS
     plugin: Script
     script:
-      - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-      - sudo sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-      - sudo apt-get -qq update
-      - sudo apt-get -qq install google-chrome-stable -y --force-yes > /dev/null 2>&1
-      - which google-chrome
-      - wget http://chromedriver.storage.googleapis.com/2.32/chromedriver_linux64.zip > /dev/null 2>&1
-      - sudo unzip chromedriver_linux64.zip -d /usr/bin
+      - apt-get update > /dev/null 2>&1
+      - apt-get install google-chrome-stable xvfb -y > /dev/null 2>&1
+      - wget http://chromedriver.storage.googleapis.com/2.40/chromedriver_linux64.zip > /dev/null 2>&1
+      - unzip chromedriver_linux64.zip -d /usr/bin
       - wget http://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar > /dev/null 2>&1
       - xvfb-run java -jar selenium-server-standalone-2.53.1.jar -Dwebdriver.chrome.driver="/usr/bin/chromedriver" > /dev/null 2>&1 & sleep 5
       - cd /var/www/html/profiles/sitefarm_seed
       - $SRC_DIR/sitefarm-distro-template/vendor/bin/behat --profile probo --tags "@javascript" --colors --format progress
-      - disown
   - name: Post to Slack
     plugin: Script
     script: |

README.md

@@ -1,6 +1,6 @@
 # SiteFarm Seed
 
-SiteFarm Seed is a base-profile for Drupal 8 meant for extending by a custom built sub-profile.
+SiteFarm Seed is a base profile for Drupal 8 meant for extending by a custom built sub-profile.
 
 It provides sensible defaults and features that most websites will need.
 

composer.json

@@ -51,6 +51,7 @@
     "drupal/drupal-extension": "^3.1"
   },
   "require": {
+    "drupal/core": "^8.5.4",
     "cweagans/composer-patches": "^1.5",
     "composer/installers": "^1.0",
     "drupal/address": "1.*",
@@ -86,24 +87,12 @@
     "drupal/webform_views": "5.*"
   },
   "extra": {
-    "installer-paths": {
-      "modules/contrib/{$name}": [
-        "type:drupal-module"
-      ],
-      "themes/contrib/{$name}": [
-        "type:drupal-theme"
-      ]
-    },
     "patches": {
       "drupal/core": {
-        "Fix broken ckeditor style dropdowns for Objects": "https://www.drupal.org/files/issues/fix_ckeditor_styles_dropdown-2911749-17.patch",
-        "datetime-range views enhancements": "https://www.drupal.org/files/issues/the_views_integration-2786577-202.patch",
-        "Profile Inheritance": "https://www.drupal.org/files/issues/1356276-408--8.4.x.patch",
-        "multiple image upload dimension fix": "https://www.drupal.org/files/issues/multiple_upload_at_once-2644468-66.patch",
-        "Drupalimage calling drupallink functions without checking if the plugin is loaded #13": "https://www.drupal.org/files/issues/edit_drupalimage-2855521-13.patch"
-      },
-      "drupal/photoswipe": {
-        "php error: Render context is empty": "https://www.drupal.org/files/issues/render_context_empty-2824022-4.patch"
+        "datetime-range views enhancements": "https://www.drupal.org/files/issues/2786577-270_0.patch",
+        "Profile Inheritance": "https://www.drupal.org/files/issues/1356278-408--8.5.x-real.patch",
+        "multiple image upload dimension fix": "https://www.drupal.org/files/issues/2018-04-28/2644468-91.patch",
+        "Drupalimage calling drupallink functions without checking if the plugin is loaded #15": "https://www.drupal.org/files/issues/edit_drupalimage-2855521-15.patch"
       },
       "drupal/url_embed": {
         "make embeds responsive": "https://www.drupal.org/files/issues/option-to-make-embeds-responsive-2825602-2.patch"

tests/features/photo_gallery.feature

@@ -12,6 +12,7 @@ Feature: Photo Gallery Content Type
       And I fill in the following:
         | Title | Gallery Name |
       And I attach the file "test_16x9.png" to "files[field_sf_gallery_photos_0][]"
+      And I wait 2 seconds
       And I attach the file "test_16x9.png" to "files[field_sf_primary_image_0]"
     When I press "Save"
       And I fill in "field_sf_gallery_photos[0][alt]" with "alt text"