update tests (#21)

This commit is contained in:
Stef Heyenrath
2017-03-20 17:56:34 +01:00
parent bd8e18b2c4
commit e1c1db6480
3 changed files with 10 additions and 7 deletions

View File

@@ -24,7 +24,7 @@ namespace WireMock.Server
/// </summary>
public partial class FluentMockServer
{
private const string AdminMappingsFolder = @"\__admin\mappings\";
private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
private const string AdminMappings = "/__admin/mappings";
private const string AdminRequests = "/__admin/requests";
private const string AdminSettings = "/__admin/settings";
@@ -45,12 +45,12 @@ namespace WireMock.Server
public void ReadStaticMappings([CanBeNull] string folder = null)
{
if (folder == null)
folder = Directory.GetCurrentDirectory() + AdminMappingsFolder;
folder = Path.Combine(Directory.GetCurrentDirectory(), AdminMappingsFolder);
if (!Directory.Exists(folder))
return;
foreach (string filename in Directory.EnumerateFiles(Directory.GetCurrentDirectory() + AdminMappingsFolder))
foreach (string filename in Directory.EnumerateFiles(folder).OrderBy(f => f))
{
ReadStaticMapping(filename);
}