summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--spec/Rakefile17
1 files changed, 3 insertions, 14 deletions
diff --git a/spec/Rakefile b/spec/Rakefile
index 8026fd959..e2996f64f 100644
--- a/spec/Rakefile
+++ b/spec/Rakefile
@@ -8,22 +8,11 @@ puppettestlibdir = File.join(basedir, "../test/lib")
speclibdir = File.join(basedir, "lib")
libs = [puppetlibdir, puppettestlibdir, speclibdir]
-
-desc "Run all spec unit tests"
-Spec::Rake::SpecTask.new('unit') do |t|
- t.spec_files = FileList['unit/**/*.rb']
- t.libs = libs
- t.spec_opts = ['--options', 'spec.opts']
-end
-
-desc "Run all spec integration tests"
-Spec::Rake::SpecTask.new('integration') do |t|
- t.spec_files = FileList['integration/**/*.rb']
+desc "Run all specs"
+Spec::Rake::SpecTask.new('all') do |t|
+ t.spec_files = FileList['integration/**/*.rb', 'unit/**/*.rb']
t.libs = libs
t.spec_opts = ['--options', 'spec.opts']
end
-desc "Run all specs"
-task :all => [:unit, :integration]
-
task :default => [:all]