spec/support/search.rb in ripple-1.0.0.beta vs spec/support/search.rb in ripple-1.0.0.beta2

@@ -1,14 +1,14 @@
 require 'support/test_server'
 
 class Riak::TestServer
   # For now this is a local hack - later we'll make it global.
   def riak_search?
-    (s = status) && s['riak_search_version']
+    control_script.basename.to_s == 'riaksearch' || (version >= "1.0.0" && env[:riak_search][:enabled])
   end
 end
 
 RSpec.configure do |config|
   config.before(:all, :search => true) do
-    pending("depends upon riak search, which is not available") unless $test_server.riak_search?
+    pending("depends upon riak search, which is not available") unless test_server.riak_search?
   end
 end