Thrift-1644:Upgrade RSpec to 2.11.x and refactor specs as needed
Client: rb
Patch: Nathan Beyer
Upgrading to rspec2.
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1391280 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/rb/spec/spec_helper.rb b/lib/rb/spec/spec_helper.rb
index ccb1adf..9701c7c 100644
--- a/lib/rb/spec/spec_helper.rb
+++ b/lib/rb/spec/spec_helper.rb
@@ -18,7 +18,7 @@
#
require 'rubygems'
-require 'spec'
+require 'rspec'
$:.unshift File.join(File.dirname(__FILE__), *%w[.. ext])
@@ -26,7 +26,7 @@
# will get screwed up
# $" << 'fastthread.bundle'
-require File.dirname(__FILE__) + '/../lib/thrift'
+require 'thrift'
class Object
# tee is a useful method, so let's let our tests have it
@@ -36,15 +36,15 @@
end
end
-Spec::Runner.configure do |configuration|
+RSpec.configure do |configuration|
configuration.before(:each) do
Thrift.type_checking = true
end
end
$:.unshift File.join(File.dirname(__FILE__), *%w[.. test debug_proto gen-rb])
-require "srv"
-require "debug_proto_test_constants"
+require 'srv'
+require 'debug_proto_test_constants'
$:.unshift File.join(File.dirname(__FILE__), *%w[gen-rb])
require 'thrift_spec_types'