aboutsummaryrefslogtreecommitdiffstats
path: root/lib/tasks
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-01-15 17:04:06 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-01-15 17:04:06 +1100
commite6c80e93df44a436d9c94a9c076eb321df249b2a (patch)
treef2396181cfadeca370446f936f0bc4c1da3888dd /lib/tasks
parentb5f2bed1e406cd7fb6b50259a57be201c797db7d (diff)
parent843805e5d92eded943bd2a32b02ac967539245e8 (diff)
Merge remote-tracking branch 'mysociety/develop' into rails_xss
Diffstat (limited to 'lib/tasks')
-rw-r--r--lib/tasks/rspec.rake5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
index 1eee74aee..d4fd4a9ff 100644
--- a/lib/tasks/rspec.rake
+++ b/lib/tasks/rspec.rake
@@ -23,6 +23,9 @@ rescue MissingSourceFile
module Spec
module Rake
class SpecTask
+ if defined?(::Rake::DSL)
+ include ::Rake::DSL
+ end
def initialize(name)
task name do
# if rspec-rails is a configured gem, this will output helpful material and exit ...
@@ -52,8 +55,6 @@ end
task :default => :spec
task :stats => "spec:statsetup"
-# XXX commonlib tests are not Ruby 1.9 compatible
-#task :spec => ['spec:commonlib']
task :test => ['spec']
task :cruise => ['spec']