diff --git a/docs/features/management.rst b/docs/features/management.rst deleted file mode 100644 index accbf5d94..000000000 --- a/docs/features/management.rst +++ /dev/null @@ -1,4 +0,0 @@ -|stub| Server Management -======================== - -|stub-desc| \ No newline at end of file diff --git a/docs/index.rst b/docs/index.rst index c4469cd46..d2ff662af 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -29,7 +29,8 @@ This Documentation is **currently undergoing a rewrite**. Some pages (marked wit getting_started features/logging - features/management + features/server-management + features/user-management features/permissions features/commands features/voice diff --git a/test/Discord.Net.Tests/Discord.Net.Tests.csproj b/test/Discord.Net.Tests/Discord.Net.Tests.csproj index 97d328c68..0c13b7075 100644 --- a/test/Discord.Net.Tests/Discord.Net.Tests.csproj +++ b/test/Discord.Net.Tests/Discord.Net.Tests.csproj @@ -37,7 +37,7 @@ - ..\..\..\DiscordBot\packages\Newtonsoft.Json.8.0.1\lib\net45\Newtonsoft.Json.dll + ..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll True diff --git a/test/Discord.Net.Tests/Tests.cs b/test/Discord.Net.Tests/Tests.cs index e3d3977ad..51c045d69 100644 --- a/test/Discord.Net.Tests/Tests.cs +++ b/test/Discord.Net.Tests/Tests.cs @@ -42,7 +42,7 @@ namespace Discord.Tests //Create new server and invite the other bots to it _testServer = _hostClient.CreateServer("Discord.Net Testing", _hostClient.Regions.First()).Result; _testServerChannel = _testServer.DefaultChannel; - Invite invite = _testServer.CreateInvite(60, 1, false, false).Result; + var invite = _testServer.CreateInvite(60, 2, false, false).Result; WaitAll( _targetBot.GetInvite(invite.Code).Result.Accept(), _observerBot.GetInvite(invite.Code).Result.Accept()); @@ -122,6 +122,8 @@ namespace Discord.Tests _observerBot.Disconnect()); } + // Unit Test Helpers + private static void AssertEvent(string msg, Func action, Action> addEvent, Action> removeEvent, Func test = null) { AssertEvent(msg, action, addEvent, removeEvent, test, true); diff --git a/test/Discord.Net.Tests/packages.config b/test/Discord.Net.Tests/packages.config index 0eaf37a38..2abc396bb 100644 --- a/test/Discord.Net.Tests/packages.config +++ b/test/Discord.Net.Tests/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file