Permalink
Browse files

Don't test Oj on JRuby

  • Loading branch information...
1 parent 00f0e79 commit eb2345d456eabc0ebada3a2e9bc007d00169b53e @sferik sferik committed Mar 16, 2012
Showing with 2 additions and 8 deletions.
  1. +0 −4 spec/helper.rb
  2. +2 −4 spec/multi_json_spec.rb
View
@@ -25,10 +25,6 @@ def to_json(options = {})
end
end
-def nsjsonserialization_on_other_than_macruby(engine)
- engine == 'nsjsonserialization' && !macruby?
-end
-
def jruby?
defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
end
@@ -61,10 +61,8 @@
end
%w(json_gem json_pure nsjsonserialization oj ok_json yajl).each do |engine|
- if nsjsonserialization_on_other_than_macruby(engine)
- puts "NSJSONSerialization is exclusively available for MacRuby only."
- next
- end
+ next if !macruby? && engine == 'nsjsonserialization'
+ next if jruby? && engine == 'oj'
context engine do
before do

0 comments on commit eb2345d

Please sign in to comment.