spec/integration/echo_spec.rb in goliath-0.9.4 vs spec/integration/echo_spec.rb in goliath-1.0.0.beta.1

@@ -1,36 +1,36 @@
 require 'spec_helper'
 require File.join(File.dirname(__FILE__), '../../', 'examples/echo')
 require 'multipart_body'
-require 'yajl'
+require 'yajl' if RUBY_PLATFORM != 'java'
 
 describe Echo do
   let(:err) { Proc.new { fail "API request failed" } }
 
   it 'returns the echo param' do
     with_api(Echo) do
       get_request({:query => {:echo => 'test'}}, err) do |c|
-        b = Yajl::Parser.parse(c.response)
+        b = MultiJson.load(c.response)
         b['response'].should == 'test'
       end
     end
   end
 
   it 'returns error without echo' do
     with_api(Echo) do
       get_request({}, err) do |c|
-        b = Yajl::Parser.parse(c.response)
+        b = MultiJson.load(c.response)
         b['error'].should_not be_nil
-        b['error'].should == 'Echo identifier missing'
+        b['error'].should == 'echo identifier missing'
       end
     end
   end
 
   it 'echos POST data' do
     with_api(Echo) do
       post_request({:body => {'echo' => 'test'}}, err) do |c|
-        b = Yajl::Parser.parse(c.response)
+        b = MultiJson.load(c.response)
         b['response'].should == 'test'
       end
     end
   end
 
@@ -39,23 +39,23 @@
       body = MultipartBody.new(:echo => 'test')
       head = {'content-type' => "multipart/form-data; boundary=#{body.boundary}"}
 
       post_request({:body => body.to_s,
                     :head => head}, err) do |c|
-        b = Yajl::Parser.parse(c.response)
+        b = MultiJson.load(c.response)
         b['response'].should == 'test'
       end
     end
   end
 
   it 'echos application/json POST body data' do
     with_api(Echo) do
-      body = Yajl::Encoder.encode({'echo' => 'My Echo'})
+      body = MultiJson.dump({'echo' => 'My Echo'})
       head = {'content-type' => 'application/json'}
 
       post_request({:body => body.to_s,
                     :head => head}, err) do |c|
-        b = Yajl::Parser.parse(c.response)
+        b = MultiJson.load(c.response)
         b['response'].should == 'My Echo'
       end
     end
   end
 end