Pull in missing script changes (#2546)

* Pull in missing script changes
* Update changelog, add circle.conf file
* revert circleci/config.yml change

.ahoy/.scripts/dkan-test.rb

@@ -5,9 +5,9 @@
 require "base64"
 require "./dkan/.ahoy/.scripts/behat-parse-params"
 
-BEHAT_FOLDER = ENV.has_key?("BEHAT_FOLDER") ? ENV["BEHAT_FOLDER"] : "docroot/profiles/dkan/test"
-ALT_CONFIG_FILE = ENV.has_key?("ALT_CONFIG_FILE") ? ENV["ALT_CONFIG_FILE"] : "behat.local.yml"
-BEHAT_ENV = ENV['HOSTNAME']
+BEHAT_FOLDER = ENV.has_key?("BEHAT_FOLDER") && ENV["BEHAT_FOLDER"] != "" ? ENV["BEHAT_FOLDER"] : "docroot/profiles/dkan/test"
+ALT_CONFIG_FILE = ENV.has_key?("ALT_CONFIG_FILE") && ENV["ALT_CONFIG_FILE"] != "" ? ENV["ALT_CONFIG_FILE"] : "behat.local.yml"
+BEHAT_ENV = ENV.has_key?("HOSTNAME") && ENV["HOSTNAME"] != "" ? ENV["HOSTNAME"] : "cli"
 SKIP_COMPOSER_FLAG="--skip-composer"
 
 if File.exists? "#{BEHAT_FOLDER}/#{ALT_CONFIG_FILE}"

.ahoy/dkan.ahoy.yml

@@ -151,7 +151,7 @@ commands:
       fi
 
       b64=`echo "payload: $input" | base64 $wrap 0`
-      ahoy cmd-proxy ruby dkan/.ahoy/.scripts/dkan-test.rb "$b64"
+      ahoy cmd-proxy BEHAT_FOLDER=$BEHAT_FOLDER ALT_CONFIG_FILE="ALT_CONFIG_FILE" ruby dkan/.ahoy/.scripts/dkan-test.rb "$b64"
 
   unittests:
     usage: Run phpunit tests

.circleci/config.yml

@@ -126,4 +126,3 @@ jobs:
             fi
       - store_artifacts:
           path: /go/src/github.com/dkan/assets
-

.circleci/tests/circle/circle.conf

@@ -0,0 +1,13 @@
+<VirtualHost *:80>
+
+  UseCanonicalName Off
+  ServerName test.dev
+  DocumentRoot /home/circleci/site_build/docroot
+
+  <Directory "/home/circleci/site_build/docroot">
+    Options FollowSymLinks
+    AllowOverride All
+    Require all granted
+  </Directory>
+
+</VirtualHost>

CHANGELOG.txt

@@ -1,3 +1,19 @@
+7.x-1.15.1
+----------
+- #2533 #2546 Updates docker-compose to use updated cli container
+- #2542 Add theme setting to adjust hero region height
+- #2531 Add table tags to allowed html
+- #2527 Stop xdebug in web and cli containers for tests
+- #2521 Add custom validation rules to the REST API node creation
+- #2498 Fix the link to installation info on README.md
+- #2463 Update circle setup to use local DEV containers
+- #2485 Check the character length of harvested resource urls
+- #2476 Update getExtension() and createResources() functions
+- #2452 Fix front page link paths on logo and site name
+- #2489 Create variable for map tile url
+- #2492 Security update for file_resup module, upgrade to version 1.5
+- #2358 Fix datastore error reporting when UUID is missing
+
 7.x-1.15
 ----------
 - #2339 Adds a linkchecker to DKAN.