BUILDR-705 - Avoid attempting to load rspec classes unless Buildr.rspec_present? returns true.
Reported By rbpandey. Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/e02fbf89 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/e02fbf89 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/e02fbf89 Branch: refs/heads/master Commit: e02fbf89d94b2052665ff9c4e6b4046286c2887a Parents: a71ddf3 Author: Peter Donald <[email protected]> Authored: Sat Jun 6 10:31:28 2015 +1000 Committer: Peter Donald <[email protected]> Committed: Sat Jun 6 10:31:28 2015 +1000 ---------------------------------------------------------------------- CHANGELOG | 2 ++ lib/buildr/java/test_result.rb | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/e02fbf89/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 8861c05..83d00d0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ * Change: BUILDR-706 - Update the checkstyle addon use checkstyle 6.6. Submitted by Dieter Vrancken. * Fixed: Fix Buildr.rspec_present? so that it works under jruby 1.6.7.2 +* Change: BUILDR-705 - Avoid attempting to load rspec classes unless Buildr.rspec_present? + returns true. Reported By rbpandey. * Fixed: Remove debug output left in ipr.sql_dialect_mappings. 1.4.22 (2015-02-28) http://git-wip-us.apache.org/repos/asf/buildr/blob/e02fbf89/lib/buildr/java/test_result.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/java/test_result.rb b/lib/buildr/java/test_result.rb index 979142c..84037d1 100644 --- a/lib/buildr/java/test_result.rb +++ b/lib/buildr/java/test_result.rb @@ -15,11 +15,6 @@ # It is necessary to require these files here as the bdd plugin directly includes this file require 'yaml' -begin - require 'rspec/core/formatters/base_formatter' -rescue LoadError - # If Rspec is not present then assume we do no need Yaml formatter -end module Buildr #:nodoc: module TestFramework #:nodoc:
