protobuffs_backends_spec.rb in riak-client-2.0.0.rc1

- old
+ new

@@ -1,12 +1,11 @@
 require 'spec_helper'
 
-describe "Protocol Buffers" do
+describe "Protocol Buffers", test_client: true do
   before do
-    @pbc_port ||= test_server.pb_port
-    @http_port ||= test_server.http_port
-    @client = Riak::Client.new(:http_port => @http_port, :pb_port => @pbc_port, :protocol => "pbc")
+    @client = test_client
+    @bucket = random_bucket 'protobuf_spec'
   end
 
   [:BeefcakeProtobuffsBackend].each do |klass|
     bklass = Riak::Client.const_get(klass)
     if bklass.configured?
@@ -15,33 +14,17 @@
           @backend = bklass.new(@client, @client.node)
         end
 
         it_should_behave_like "Unified backend API"
 
-        describe "searching fulltext indexes (1.1 and earlier)", :version => '< 1.2.0' do
+        describe "searching yokozuna" do
           include_context "search corpus setup"
 
-          it 'should find document IDs via MapReduce' do
-            # Note that the trailing options Hash is ignored when
-            # emulating search with MapReduce
-            results = @backend.search 'search_test', 'fearless elephant rushed'
-            results.should have_key 'docs'
-            results.should have_key 'max_score'
-            results.should have_key 'num_found'
-            results['docs'].should include({"id" => "munchausen-605"})
-          end
-        end
-
-        if "".respond_to?(:encoding) # Ruby 1.9 and later only
-          describe "searching fulltext indexes (1.2 and later)", :version => '>= 1.2.0' do
-            include_context "search corpus setup"
-
-            it 'should return documents with UTF-8 fields (GH #75)' do
-              utf8 = Encoding.find('UTF-8')
-              results = @backend.search 'search_test', 'fearless elephant rushed'
-              results['docs'].each do |d|
-                d.each {|(k,v)| k.encoding.should == utf8; v.encoding.should == utf8 }
-              end
+          it 'should return documents with UTF-8 fields (GH #75)' do
+            utf8 = Encoding.find('UTF-8')
+            results = @backend.search @search_bucket.name, 'fearless elephant rushed', df: 'text'
+            results['docs'].each do |d|
+              d.each {|(k,v)| expect(k.encoding).to eq(utf8); expect(v.encoding).to eq(utf8) }
             end
           end
         end
       end
     end