Fixed tests

This commit is contained in:
Brandon Smith
2015-08-18 02:50:16 -03:00
parent 4cd0094a2b
commit 07b8ea8450
8 changed files with 83 additions and 38 deletions

View File

@@ -22,11 +22,11 @@ namespace Discord.Helpers
static Http()
{
_client = new HttpClient();
_client.DefaultRequestHeaders.Add("Accept", "*/*");
_client.DefaultRequestHeaders.Add("Accept-language", "en-US;q=0.8");
_client.DefaultRequestHeaders.Add("accept", "*/*");
_client.DefaultRequestHeaders.Add("accept-language", "en-US;q=0.8");
string version = typeof(Http).GetTypeInfo().Assembly.GetName().Version.ToString(2);
_client.DefaultRequestHeaders.Add("User-agent", $"Discord.Net/{version} (https://github.com/RogueException/Discord.Net)");
_client.DefaultRequestHeaders.Add("user-agent", $"Discord.Net/{version} (https://github.com/RogueException/Discord.Net)");
}
private static string _token;
@@ -36,7 +36,9 @@ namespace Discord.Helpers
set
{
_token = value;
_client.DefaultRequestHeaders.Add("Authorization", _token);
_client.DefaultRequestHeaders.Remove("authorization");
if (_token != null)
_client.DefaultRequestHeaders.Add("authorization", _token);
}
}
@@ -132,19 +134,6 @@ namespace Discord.Helpers
}
}
private static Stream GetDecoder(string contentEncoding, MemoryStream encodedStream)
{
switch (contentEncoding)
{
case "gzip":
return new GZipStream(encodedStream, CompressionMode.Decompress, true);
case "deflate":
return new DeflateStream(encodedStream, CompressionMode.Decompress, true);
default:
throw new ArgumentOutOfRangeException("Unknown encoding: " + contentEncoding);
}
}
#if DEBUG
private static void CheckResponse<T>(string json, T obj)
{

View File

@@ -26,8 +26,8 @@ namespace Discord
{
ServerId = serverId;
UserId = userId;
_client = client;
JoinedAt = joinedAt;
}
_client = client;
}
}
}