Merge branch 'master' of github.com:locomotivecms/engine

This commit is contained in:
did 2011-10-17 19:00:31 +02:00
commit e0707a8f0a
4 changed files with 24 additions and 3 deletions

9
.travis.yml Normal file
View File

@ -0,0 +1,9 @@
script: "bundle exec rake travis"
before_script: ./bin/ci/before_build.sh
rvm:
- 1.9.2
notifications:
email:
- didier@nocoffee.fr
- mario@mariovisic.com
irc: "irc.freenode.org#locomotivecms"

View File

@ -64,8 +64,8 @@ group :test, :development do
end
group :test do
gem 'autotest'
gem 'ZenTest'
gem 'autotest', :platforms => :mri
gem 'ZenTest', :platforms => :mri
gem 'growl-glue'
gem 'rspec-rails', '2.6.1'
gem 'factory_girl_rails', '~> 1.1'

View File

@ -69,3 +69,11 @@ task :spec_nix do
sh "bundle exec rspec #{files}"
end
task :travis do
["rspec spec", "cucumber -b"].each do |cmd|
puts "Starting to run #{cmd}..."
system("export DISPLAY=:99.0 && bundle exec #{cmd}")
raise "#{cmd} failed!" unless $?.exitstatus == 0
end
end

4
bin/ci/before_build.sh Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
sh -e /etc/init.d/xvfb start
echo "echo \"127.0.0.1 test.example.com\" >> /etc/hosts" | sudo sh
sudo hostname test.example.com