codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-30 19:08:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:discourse/discourse

Browse source
This commit is contained in:
Sam 2014-06-20 09:27:46 +10:00
commit bacd2c0469
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/tasks/docker.rake
View file

@ -9,14 +9,6 @@ desc 'Run all tests (JS and code in a standalone environment)'
task 'docker:test' do task 'docker:test' do
begin begin
unless ENV['NO_UPDATE']
exit 1 unless run_or_fail("git remote update")
checkout = ENV['COMMIT_HASH'] || "HEAD"
exit 1 unless run_or_fail("git checkout #{checkout}")
exit 1 unless run_or_fail("bundle")
end
puts "Cleaning up old test tmp data in tmp/test_data" puts "Cleaning up old test tmp data in tmp/test_data"
`rm -fr tmp/test_data && mkdir -p tmp/test_data/redis && mkdir tmp/test_data/pg` `rm -fr tmp/test_data && mkdir -p tmp/test_data/redis && mkdir tmp/test_data/pg`
@ -31,7 +23,6 @@ task 'docker:test' do
`echo full_page_writes = off >> tmp/test_data/pg/postgresql.conf` `echo full_page_writes = off >> tmp/test_data/pg/postgresql.conf`
`echo shared_buffers = 500MB >> tmp/test_data/pg/postgresql.conf` `echo shared_buffers = 500MB >> tmp/test_data/pg/postgresql.conf`
puts "Starting postgres" puts "Starting postgres"
@pg_pid = Process.spawn("#{@postgres_bin}postmaster -D tmp/test_data/pg") @pg_pid = Process.spawn("#{@postgres_bin}postmaster -D tmp/test_data/pg")
@ -39,8 +30,12 @@ task 'docker:test' do
ENV["RAILS_ENV"] = "test" ENV["RAILS_ENV"] = "test"
@good = run_or_fail("bundle exec rake db:create db:migrate") @good = run_or_fail("bundle exec rake db:create db:migrate")
@good &&= run_or_fail("bundle exec rspec") unless ENV["JS_ONLY"]
@good &&= run_or_fail("bundle exec rake qunit:test") @good &&= run_or_fail("bundle exec rspec")
end
unless ENV["RUBY_ONLY"]
@good &&= run_or_fail("bundle exec rake qunit:test")
end
ensure ensure
puts "Terminating" puts "Terminating"