Fix circle.yml fail ahoy dkan server.

GetDKAN · Jul 26, 2017 · c69325a · c69325a
1 parent b36f571
commit c69325a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/assets/templates/circle.yml.erb b/assets/templates/circle.yml.erb
@@ -35,8 +35,6 @@ dependencies:
     - echo "always_populate_raw_post_data = -1" > $PHPENV_ROOT/versions/$(phpenv global)/etc/conf.d/deprecated.ini
     - sudo apt-get update -y && sudo apt-get install -y x11vnc clamav clamav-freshclam
     - yes | sudo perl -MCPAN -e "install Digest::HMAC_SHA1;"
-    - ahoy dkan server:
-      background: true
 
   override:
     - printenv
@@ -47,8 +45,8 @@ dependencies:
     - ahoy site up --db-user=ubuntu --db-pass='' --db-host=127.0.0.1 --db-port=3306 --db-name=circle_test
     - ahoy utils fail-when-bad-disable
     # Run a webserver using drush.
-    - 'ahoy drush --yes runserver :8888':
-        background: true
+    - ahoy dkan server:
+      background: true
 
     - wget http://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar
     - java -jar selenium-server-standalone-2.53.1.jar -p 4444 :

diff --git a/circle.yml b/circle.yml
@@ -35,8 +35,6 @@ dependencies:
     - echo "always_populate_raw_post_data = -1" > $PHPENV_ROOT/versions/$(phpenv global)/etc/conf.d/deprecated.ini
     - sudo apt-get update -y && sudo apt-get install -y x11vnc clamav clamav-freshclam
     - yes | sudo perl -MCPAN -e "install Digest::HMAC_SHA1;"
-    - ahoy dkan server:
-      background: true
 
   override:
     - printenv
@@ -46,9 +44,9 @@ dependencies:
     - drush dl -n registry_rebuild-7.x
     - ahoy site up --db-user=ubuntu --db-pass='' --db-host=127.0.0.1 --db-port=3306 --db-name=circle_test
     - ahoy utils fail-when-bad-disable
-    # Run a webserver using drush.
-    - 'ahoy drush --yes runserver :8888':
-        background: true
+      # Run a webserver using drush.
+    - ahoy dkan server:
+      background: true
 
     - wget http://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar
     - java -jar selenium-server-standalone-2.53.1.jar -p 4444 :

diff --git a/dkan/test/behat.yml b/dkan/test/behat.yml
@@ -123,8 +123,10 @@ default:
       tags: ~@fixme
   extensions: 
     Behat\MinkExtension: 
-      goutte: 
-      selenium2: 
+      goutte: []
+
+      selenium2: []
+
       default_session: goutte
       javascript_session: selenium2
       browser_name: chrome

diff --git a/dkan/test/dkanextension/src/Drupal/DKANExtension/Context/PODContext.php b/dkan/test/dkanextension/src/Drupal/DKANExtension/Context/PODContext.php
@@ -36,7 +36,7 @@ public function iSeeAValidDataJson($should)
   {
     $data_json = open_data_schema_map_api_load('data_json_1_1');
     // Get base URL.
-    $url = $this->getMinkParameter('base_url') ? $this->getMinkParameter('base_url') : "http://127.0.0.1::8888";
+    $url = $this->getMinkParameter('base_url') ? $this->getMinkParameter('base_url') : "http://127.0.0.1:8888";
 
     // Validate POD.
     $results = open_data_schema_pod_process_validate($url . '/data.json', TRUE);