Merge branch 'master' of github.com:locomotivecms/engine
This commit is contained in:
commit
e0707a8f0a
|
@ -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"
|
4
Gemfile
4
Gemfile
|
@ -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'
|
||||
|
|
10
Rakefile
10
Rakefile
|
@ -68,4 +68,12 @@ task :spec_nix do
|
|||
).collect { |f| File.join('spec', f) }.join(' ')
|
||||
|
||||
sh "bundle exec rspec #{files}"
|
||||
end
|
||||
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
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue