Remove activesupportrm-activesupport

3 files changed, 1 insertions, 9 deletions

diff --git a/Gemfile b/Gemfile
index 1418235ebc..f3d5e81494 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,6 @@
 source "https://rubygems.org"
 gemspec :name => "chef"
 
-gem "activesupport", "< 4.0.0", :group => :compat_testing, :platform => "ruby"
-
 group(:docgen) do
   gem "yard"
 end
diff --git a/ci/jenkins_run_tests.sh b/ci/jenkins_run_tests.sh
index 5bf7def062..8dfa8f09e3 100755
--- a/ci/jenkins_run_tests.sh
+++ b/ci/jenkins_run_tests.sh
@@ -5,7 +5,7 @@ export PATH=$PATH:/usr/local/bin
 ruby -v;
 # remove the Gemfile.lock and try again if bundler fails.
 # This should take care of Gemfile changes that result in "bad" bundles without forcing us to rebundle every time
-bundle install --without docgen --path vendor/bundle || ( rm Gemfile.lock && bundle install --path vendor/bundle )
+bundle install --without docgen --path vendor/bundle || ( rm Gemfile.lock && bundle install --without docgen --path vendor/bundle )
 bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec;
 RSPEC_RETURNCODE=$?
 
diff --git a/tasks/rspec.rb b/tasks/rspec.rb
index 95ae274955..df7f9a082d 100644
--- a/tasks/rspec.rb
+++ b/tasks/rspec.rb
@@ -39,12 +39,6 @@ begin
     t.pattern = FileList['spec/functional/**/*_spec.rb']
   end
 
-  desc "Run the rspec tests with activesupport loaded"
-  RSpec::Core::RakeTask.new(:spec_activesupport) do |t|
-    t.rspec_opts = ['--options', "\"#{CHEF_ROOT}/.rspec\"", "--require active_support/core_ext"]
-    t.pattern = FileList['spec/unit/**/*_spec.rb']
-  end
-
   namespace :spec do
     desc "Run all specs in spec directory with RCov"
     RSpec::Core::RakeTask.new(:rcov) do |t|