Minor tweaks to accomodate acceptance specs

This commit is contained in:
Fabio Rehm 2014-03-12 22:15:58 -03:00
parent 35feb11367
commit f67c6a1f31
3 changed files with 16 additions and 11 deletions

11
Gemfile
View file

@ -17,15 +17,14 @@ group :development, :test do
gem 'rake' gem 'rake'
# TODO: Update https://github.com/fgrehm/vagrant-lxc/issues/111 # TODO: Update https://github.com/fgrehm/vagrant-lxc/issues/111
gem 'rspec', '2.99.0.beta2' gem 'rspec', '2.99.0.beta2'
gem 'coveralls', require: false gem 'coveralls', require: (ENV['COVERAGE'] == 'true')
gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git' gem 'vagrant-spec', git: 'https://github.com/mitchellh/vagrant-spec.git'
end end
group :plugins do group :plugins do
gem 'vagrant-lxc', path: '.' gem 'vagrant-lxc', path: '.'
if ENV['ACCEPTANCE'] != 'true' acceptance = (ENV['ACCEPTANCE'] == 'true')
gem 'vagrant-cachier', git: 'https://github.com/fgrehm/vagrant-cachier.git' gem 'vagrant-cachier', git: 'https://github.com/fgrehm/vagrant-cachier.git', require: !acceptance
gem 'vagrant-pristine', git: 'https://github.com/fgrehm/vagrant-pristine.git' gem 'vagrant-pristine', git: 'https://github.com/fgrehm/vagrant-pristine.git', require: !acceptance
gem 'vagrant-omnibus' gem 'vagrant-omnibus', require: !acceptance
end
end end

View file

@ -113,7 +113,7 @@ GEM
thor (0.18.1) thor (0.18.1)
timers (1.1.0) timers (1.1.0)
tins (1.0.0) tins (1.0.0)
vagrant-omnibus (1.3.0) vagrant-omnibus (1.3.1)
wdm (0.1.0) wdm (0.1.0)
PLATFORMS PLATFORMS

View file

@ -3,6 +3,15 @@ unless ENV['USER'] == 'vagrant'
exit 1 exit 1
end end
# FIXME: Figure out why this doesn't work
if ENV['COVERAGE'] == 'true'
require 'simplecov'
require 'coveralls'
SimpleCov.start { add_filter '/spec/' }
SimpleCov.command_name 'acceptance'
end
# if defined? SimpleCov # if defined? SimpleCov
# SimpleCov.command_name 'acceptance' # SimpleCov.command_name 'acceptance'
# end # end
@ -20,8 +29,5 @@ end
Vagrant::Spec::Acceptance.configure do |c| Vagrant::Spec::Acceptance.configure do |c|
c.component_paths << "spec/acceptance" c.component_paths << "spec/acceptance"
c.provider 'lxc', box: ENV['BOX_PATH'], features: ['!suspend']
c.provider 'lxc',
box: ENV['BOX_PATH'],
features: ['!suspend']
end end