generators/templates/application/spec/spec_helper.rb in rhoconnect-3.1.0.beta1 vs generators/templates/application/spec/spec_helper.rb in rhoconnect-3.1.0.beta2
- old
+ new
@@ -10,24 +10,26 @@
require 'vendor/rhoconnect/lib/rhoconnect'
rescue LoadError
require 'rhoconnect'
end
-$:.unshift File.join(File.dirname(__FILE__), "..") # FIXME:
+$:.unshift File.join(File.dirname(__FILE__), "..")
# Load our rhoconnect application
require 'application'
include Rhoconnect
require 'rhoconnect/test_methods'
# Monkey patch to fix the following issue:
-# /Library/Ruby/Gems/1.8/gems/rspec-core-2.5.1/lib/rspec/core/shared_example_group.rb:45:
-# in `ensure_shared_example_group_name_not_taken': Shared example group '...' already exists (ArgumentError)
-module RSpec
- module Core
- module SharedExampleGroup
- private
- def ensure_shared_example_group_name_not_taken(name)
+# /usr/local/rvm/gems/ruby-1.8.7-p352/gems/rspec-core-2.6.4/lib/rspec/core/shared_example_group.rb:59:
+# in `ensure_shared_example_group_name_not_taken': Shared example group 'SharedRhoconnectHelper' already exists (ArgumentError)
+if RUBY_VERSION =~ /1.8/
+ module RSpec
+ module Core
+ module SharedExampleGroup
+ private
+ def ensure_shared_example_group_name_not_taken(name)
+ end
end
end
end
end
\ No newline at end of file