Skip to content
This repository has been archived by the owner on Dec 1, 2018. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/run-behat'
Browse files Browse the repository at this point in the history
  • Loading branch information
lmakarov committed Apr 29, 2016
2 parents b7f5aa5 + 03fb7a4 commit 9f25459
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## 1.3.3 (2016-04-29)

- dsh v1.13.2
- Fix regression with dsh behat

A full update is recommended. Please follow the updates instructions:
https://github.com/blinkreaction/drude#updates


## 1.3.2 (2016-04-26)

- dsh v1.13.1
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.2
1.3.3
10 changes: 6 additions & 4 deletions bin/dsh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

DSH_VERSION=1.13.1
DSH_VERSION=1.13.2

# Console colors
red='\033[0;31m'
Expand Down Expand Up @@ -1110,6 +1110,8 @@ clear_cache ()
behat ()
{
check_docker_running
cd $(yml_get_path)

local params=''
local path='tests/behat'
for i in "$@"; do
Expand All @@ -1118,7 +1120,7 @@ behat ()
path="${i#*=}"
;;
*)
params=$params$i" "
params="$params$i "
;;
esac;
done
Expand All @@ -1129,8 +1131,8 @@ behat ()
echo-red "Could not find ${behat_yml_path}"
exit 1
fi
run "cd $path && composer install --prefer-source --no-interaction"
run "cd $path && bin/behat -p docker "$params
_run "cd $path && composer install --prefer-source --no-interaction"
_run "cd $path && bin/behat -p docker $params"
}

# Execute project init scripts (if it exists)
Expand Down

0 comments on commit 9f25459

Please sign in to comment.