From 052b1d2d835b787e1ff206a63c0017bf5d746813 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Fri, 20 Sep 2013 15:00:04 +0200 Subject: [PATCH] Moved to puma as application server. --- script/local_browser_tests.sh | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/script/local_browser_tests.sh b/script/local_browser_tests.sh index 80db77f1b..c5e16d82e 100755 --- a/script/local_browser_tests.sh +++ b/script/local_browser_tests.sh @@ -9,7 +9,8 @@ while true; do esac done -export RAILS_ENV=test +#export RAILS_ENV=test +export RAILS_ENV=production bundle install @@ -17,25 +18,32 @@ rm -rf tmp/cache/file_store rm -f public/assets/*.css* rm -f public/assets/*.js* -#rake assets:precompile +rake assets:precompile rake db:drop rake db:create rake db:migrate rake db:seed -thin stop +#thin stop +pumactl --pidfile tmp/pids/puma.pid stop script/websocket-server.rb stop -thin start --threaded -d -p 4444 +#thin start --threaded -d -p 4444 +pumactl start --pidfile tmp/pids/puma.pid -d -p 4444 -e $RAILS_ENV script/websocket-server.rb start -d sleep 15 +#export REMOTE_URL='http://medenhofer:765d0dd4-994b-4e15-9f89-13f3aedeb462@ondemand.saucelabs.com:80/wd/hub' BROWSER_OS='Windows 2012' BROWSER_VERSION=20 BROWSER=firefox + rake test:browser["BROWSER_URL=http://localhost:4444"] +#rake test:browser["BROWSER_URL=http://192.168.178.20:4444"] + script/websocket-server.rb stop -thin stop +pumactl --pidfile tmp/pids/puma.pid stop +#thin stop rm -f public/assets/*.css* rm -f public/assets/*.js*