spec_helper.rb in rhoconnect-4.0.0.beta.24

- old
+ new

@@ -1,20 +1,19 @@
 require 'rubygems'
 require 'rspec'
 require 'webmock/rspec'
 require 'rspec/autorun' # Required for Rcov to run with rspec '~> 2.8.0'
-if RUBY_VERSION =~ /1.9/ || defined?(JRUBY_VERSION)
-  require 'simplecov'
-  require 'simplecov-rcov'
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-  SimpleCov.start do
-    add_filter '/spec/'
-  end
+
+require 'simplecov'
+require 'simplecov-rcov'
+SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+SimpleCov.start do
+  add_filter '/spec/'
 end
 
 # all specs are Async'd in new ruby
-if RUBY_VERSION =~ /1.9/ and not defined?(JRUBY_VERSION)
+if not defined?(JRUBY_VERSION)
   require 'eventmachine'
   require 'fiber'
 
   Thread.abort_on_exception = true
 
@@ -135,14 +134,10 @@
   def json_clone(data)
     JSON.parse(data.to_json)
   end
 
   def setup_post_yield(response)
-    if RUBY_VERSION =~ /1.9/ or defined?(JRUBY_VERSION)
-      RestClient.stub!(:post).and_yield(response, nil, nil)
-    else
-      RestClient.stub!(:post).and_yield(response)
-    end
+    RestClient.stub!(:post).and_yield(response, nil, nil)
   end
 
   def set_state(state,append=false)
     state.each do |dockey,data|
       if data.is_a?(Hash) or data.is_a?(Array)