diff options
Diffstat (limited to 'script')
| -rwxr-xr-x | script/rails-post-deploy | 27 | ||||
| -rwxr-xr-x | script/spec-all-pairs | 7 |
2 files changed, 3 insertions, 31 deletions
diff --git a/script/rails-post-deploy b/script/rails-post-deploy index df9f67528..263d5d926 100755 --- a/script/rails-post-deploy +++ b/script/rails-post-deploy @@ -55,33 +55,6 @@ cd log touch development.log fastcgi.crash.log production.log test.log cd .. -# Force appropriate environment (via a hack in config/boot.rb which needs -# applying to your rails app, see foi/config/boot.rb) -if [ ! -e "config/rails_env.rb" ] -then - cat <<END - -***************************************************************** -WARNING: About to make config/rails_env.rb which, via special -code in config/boot.rb, forces the Rails environment to be a -particular one - this is used for the mySociety deployment -system. You don't want it for local development, because it will -not work in a confusing way you try and use two environments -(e.g. development and test) in the same working directory. -***************************************************************** - -END -fi -if [ "$OPTION_STAGING_SITE" = "0" ] -then - echo "ENV['RAILS_ENV'] = 'production'" > config/rails_env.rb -elif [[ "$OPTION_DOMAIN" == *"test"* ]] -then - echo "ENV['RAILS_ENV'] = 'test'" > config/rails_env.rb -else - echo "ENV['RAILS_ENV'] = 'development'" > config/rails_env.rb -fi - if [ -n "$OPTION_THEME_URL" ] then script/plugin install --force $OPTION_THEME_URL diff --git a/script/spec-all-pairs b/script/spec-all-pairs index 338f56147..e8fa77be9 100755 --- a/script/spec-all-pairs +++ b/script/spec-all-pairs @@ -4,8 +4,7 @@ # to winkle out order-dependent failures. test_pair () { - rake db:test:purge > /dev/null - rake db:test:clone_structure > /dev/null + rake db:test:prepare > /dev/null 2>&1 if script/spec "$1" "$2" > /dev/null 2>&1 then echo "OK: $1 $2" @@ -40,8 +39,8 @@ pairs_from_stdin() { while read line do case "$line" in - \*\ FAILED:\ *) - spec/*.rb spec/$.rb) + \*\ FAILED:\ *|\ + spec/*.rb\ spec/*.rb) line=${line#\* FAILED: } if ! test_pair $line then |