Skip to content

Commit

Permalink
Ensure Travis runs the tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jcoyne committed Oct 23, 2015
1 parent f244d32 commit 74814c1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
4 changes: 3 additions & 1 deletion Rakefile
Expand Up @@ -8,8 +8,10 @@ load "lib/tasks/active_fedora_dev.rake"

CLEAN.include %w(**/.DS_Store tmp *.log *.orig *.tmp **/*~)

desc 'setup jetty and run tests'
task ci: ['jetty:clean', 'active_fedora:ci']
task spec: ['active_fedora:rspec']
desc 'run tests'
task spec: ['active_fedora:rubocop', 'active_fedora:rspec']
task rcov: ['active_fedora:rcov']

task default: [:ci]
9 changes: 4 additions & 5 deletions lib/tasks/active_fedora_dev.rake
Expand Up @@ -23,10 +23,9 @@ namespace :active_fedora do
end

require 'rspec/core/rake_task'
task rspec: :rubocop do
RSpec::Core::RakeTask.new(:rspec) do |spec|
spec.rspec_opts = ['--backtrace'] if ENV['CI']
end
desc 'Run tests only'
RSpec::Core::RakeTask.new(:rspec) do |spec|
spec.rspec_opts = ['--backtrace'] if ENV['CI']
end

require 'rubocop/rake_task'
Expand Down Expand Up @@ -62,7 +61,7 @@ namespace :active_fedora do
end

desc "Execute specs with coverage"
task :coverage do
task coverage: :rubocop do
# Put spec opts in a file named .rspec in root
ruby_engine = defined?(RUBY_ENGINE) ? RUBY_ENGINE : "ruby"
ENV['COVERAGE'] = 'true' unless ruby_engine == 'jruby'
Expand Down

0 comments on commit 74814c1

Please sign in to comment.