From 0f737547de6261c97fe283940e3b1c094276d0aa Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 18 Nov 2013 05:01:33 +0000
Subject: [PATCH] Remove Nack::JSON usage from tests

---
 test/test_server.rb | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/test/test_server.rb b/test/test_server.rb
index bebfac2..1f53ddf 100644
--- a/test/test_server.rb
+++ b/test/test_server.rb
@@ -1,5 +1,4 @@
 require 'nack/server'
-require 'nack/json'
 
 require 'minitest/autorun'
 
@@ -42,7 +41,7 @@ def start(fixture = :echo)
   def request(env = {}, body = nil)
     socket = UNIXSocket.open(sock)
 
-    NetString.write(socket, Nack::JSON.encode(env))
+    NetString.write(socket, JSON.encode(env))
     NetString.write(socket, body) if body
     NetString.write(socket, "")
 
@@ -54,7 +53,7 @@ def request(env = {}, body = nil)
       if status.nil?
         status = data.to_i
       elsif headers.nil?
-        headers = Nack::JSON.decode(data)
+        headers = JSON.decode(data)
       elsif data.length > 0
         body << data
       else
@@ -96,18 +95,13 @@ def test_invalid_json_env
       error = nil
 
       NetString.read(socket) do |data|
-        error = Nack::JSON.decode(data)
+        error = JSON.decode(data)
       end
 
       assert error
 
-      if error['name'] == "OkJson::Error"
-        assert_equal "OkJson::Error", error['name']
-        assert_equal "unexpected nil", error['message']
-      else
-        assert_equal "JSON::ParserError", error['name']
-        assert_equal "A JSON text must at least contain two octets!", error['message']
-      end
+      assert_equal "JSON::ParserError", error['name']
+      assert_equal "A JSON text must at least contain two octets!", error['message']
     end
   end
 
@@ -121,7 +115,7 @@ def test_invalid_netstring
       error = nil
 
       NetString.read(socket) do |data|
-        error = Nack::JSON.decode(data)
+        error = JSON.decode(data)
       end
 
       assert error
@@ -144,7 +138,7 @@ def test_app_error
     start :error do
       socket = UNIXSocket.open(sock)
 
-      NetString.write(socket, Nack::JSON.encode({}))
+      NetString.write(socket, JSON.encode({}))
       NetString.write(socket, "foo=bar")
       NetString.write(socket, "")
 
@@ -153,7 +147,7 @@ def test_app_error
       error = nil
 
       NetString.read(socket) do |data|
-        error = Nack::JSON.decode(data)
+        error = JSON.decode(data)
       end
 
       assert error
@@ -164,7 +158,7 @@ def test_app_error
 
   def test_spawn_error
     spawn :crash
-    error = Nack::JSON.decode(heartbeat.read)
+    error = JSON.decode(heartbeat.read)
 
     assert error
     assert_equal "RuntimeError", error['name']