THRIFT-513. rb: spec test files broken, rake searching for misnamed files
This patch causes the right files to be required and cleans up a few odd or redundant requires that were in the specs.
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@780090 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/rb/spec/spec_helper.rb b/lib/rb/spec/spec_helper.rb
index 3c20bf9..eb5d29c 100644
--- a/lib/rb/spec/spec_helper.rb
+++ b/lib/rb/spec/spec_helper.rb
@@ -44,8 +44,13 @@
end
end
-require File.dirname(__FILE__) + "/../debug_proto_test/gen-rb/Srv"
-require File.dirname(__FILE__) + "/../debug_proto_test/gen-rb/debug_proto_test_constants"
+$:.unshift File.join(File.dirname(__FILE__), *%w[.. debug_proto_test gen-rb])
+require "srv"
+require "debug_proto_test_constants"
+
+$:.unshift File.join(File.dirname(__FILE__), *%w[gen-rb])
+require 'thrift_spec_types'
+require 'nonblocking_service'
module Fixtures
COMPACT_PROTOCOL_TEST_STRUCT = COMPACT_TEST.dup