spec_helper.rb in rhoconnect-3.3.1

- old
+ new

@@ -6,11 +6,11 @@
   require 'simplecov'
   SimpleCov.start
 end
 
 # all specs are Async'd in new ruby
-if RUBY_VERSION =~ /1.9/
+if RUBY_VERSION =~ /1.9/ and not defined?(JRUBY_VERSION)
   require 'eventmachine'
   require 'fiber'
   
   Thread.abort_on_exception = true
   
@@ -199,10 +199,10 @@
   
   def validate_db_by_name(db,s,data)
     db.execute("select source_id,name,sync_priority,partition,sync_type,source_attribs,
       metadata,schema,blob_attribs,associations,last_inserted_size, backend_refresh_time
       from sources where name='#{s.name}'").each do |row|
-      
+       
       return false if row[0].to_s != s.source_id.to_s
       return false if row[1] != s.name
       return false if row[2].to_s != s.priority.to_s
       return false if row[3] != s.partition_type.to_s
       return false if row[4] != s.sync_type.to_s