Squelch warning about parens and standardize require for generated code

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@668998 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/lib/rb/spec/binaryprotocol_spec.rb b/lib/rb/spec/binaryprotocol_spec.rb
index 96bafef..5249cd9 100644 (file)
--- a/lib/rb/spec/binaryprotocol_spec.rb
+++ b/lib/rb/spec/binaryprotocol_spec.rb
@@ -294,7 +294,7 @@ class ThriftBinaryProtocolSpec < Spec::ExampleGroup
 
   describe BinaryProtocolFactory do
     it "should create a BinaryProtocol" do
-      BinaryProtocolFactory.new.get_protocol(mock("MockTransport")).should be_instance_of BinaryProtocol
+      BinaryProtocolFactory.new.get_protocol(mock("MockTransport")).should be_instance_of(BinaryProtocol)
     end
   end
 end

diff --git a/lib/rb/spec/struct_spec.rb b/lib/rb/spec/struct_spec.rb
index 4ae7d42..5554497 100644 (file)
--- a/lib/rb/spec/struct_spec.rb
+++ b/lib/rb/spec/struct_spec.rb
@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + '/spec_helper'
-require File.dirname(__FILE__) + "/gen-rb/ThriftSpec_types"
+$:.unshift File.dirname(__FILE__) + "/gen-rb"
+require "ThriftSpec_types"
 
 class ThriftStructSpec < Spec::ExampleGroup
   include Thrift