Merge pull request #300 from grosser/grosser/jrub

mark mystery jruby error as pending ... it works fine without expect

Author: lukebakken

lib/riak/multi.rb

@@ -37,10 +37,6 @@ def initialize(client, keys)
       raise ArgumentError, t('array_type', :array => keys.inspect) unless keys.is_a? Array
 
       self.thread_count = client.multi_threads
-      unless thread_count.is_a?(Integer) && thread_count > 0
-        raise ArgumentError, t("invalid_multiget_thread_count") # TODO: should be invalid_multi_thread_count
-      end
-
       validate_keys keys
       @client = client
       @keys = keys.uniq

spec/riak/multi_spec.rb

@@ -3,7 +3,13 @@
 SingleCov.covered! if defined?(SingleCov)
 
 describe Riak::Multi do
-  let(:multi) { Riak::Multi.new(@client, @pairs) }
+  class TestMulti < Riak::Multi
+    def work(bucket, key)
+      "value-#{bucket.name}-#{key}"
+    end
+  end
+
+  let(:multi) { TestMulti.new(@client, @pairs) }
 
   before :each do
     @client = Riak::Client.new
@@ -25,18 +31,15 @@
 
   describe ".perform" do
     it "works" do
-      expect_any_instance_of(Riak::Multi).to receive(:work).with(@bucket, 'key1')
-      expect_any_instance_of(Riak::Multi).to receive(:work).with(@bucket, 'key2')
-      expect(Riak::Multi.perform(@client, @pairs)).to eq([@bucket, 'key1'] => nil, [@bucket, 'key2'] => nil)
+      expect(TestMulti.perform(@client, @pairs)).to eq([@bucket, 'key1'] => 'value-foo-key1', [@bucket, 'key2'] => 'value-foo-key2')
     end
   end
 
   describe "#perform" do
     it "works on both keys from the bucket" do
-      expect(multi).to receive(:work).with(@bucket, 'key1')
-      expect(multi).to receive(:work).with(@bucket, 'key2')
       multi.perform
       multi.wait_for_finish
+      expect(multi.results).to eq([@bucket, 'key1'] => "value-foo-key1", [@bucket, 'key2'] => "value-foo-key2")
     end
 
     it "works asynchronously" do
@@ -91,18 +94,14 @@
 
   describe "#results" do
     it "returns a hash of pairs to values" do
-      expect(multi).to receive(:work).with(@bucket, 'key1')
-      expect(multi).to receive(:work).with(@bucket, 'key2')
-
       multi.perform
-
       expect(multi.results).to be_a Hash
     end
   end
 
   describe "#work" do
     it "needs to be implemented in the subclasses" do
-      expect { multi.send(:work, 1, 2) }.to raise_error(NotImplementedError)
+      expect { Riak::Multi.new(@client, @pairs).send(:work, 1, 2) }.to raise_error(NotImplementedError)
     end
   end
 end

spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'bundler/setup'
 
-if RUBY_VERSION >= "2."
+# ruby 1.9 and jruby without debug do not support single-cov
+if RUBY_VERSION >= "2." && (RUBY_ENGINE != 'jruby' || ENV['JRUBY_OPTS'].to_s.include?('--debug'))
   require 'single_cov'
   SingleCov.setup :rspec
 end