Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Remove Nack::JSON usage from tests
Browse files Browse the repository at this point in the history
  • Loading branch information
josh committed Nov 18, 2013
1 parent 57893a3 commit 0f73754
Showing 1 changed file with 9 additions and 15 deletions.
24 changes: 9 additions & 15 deletions test/test_server.rb
@@ -1,5 +1,4 @@
require 'nack/server'
require 'nack/json'

require 'minitest/autorun'

Expand Down Expand Up @@ -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, "")

Expand All @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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, "")

Expand All @@ -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
Expand All @@ -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']
Expand Down

0 comments on commit 0f73754

Please sign in to comment.