Skip to content

Commit

Permalink
version 5.8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@AntyaDev
AntyaDev committed Dec 9, 2024
1 parent d1f4750 commit 8aaa5dd
Show file tree
Hide file tree
Showing 48 changed files with 34 additions and 4,786 deletions.
14 changes: 0 additions & 14 deletions NBomber.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simulators", "simulators",
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "NBomber", "src\NBomber\NBomber.fsproj", "{53904BB5-68B2-497A-93BD-46423FBD239C}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "NBomber.IntegrationTests", "tests\NBomber.IntegrationTests\NBomber.IntegrationTests.fsproj", "{D201E3A0-AE64-41AB-B9CB-3A06D0DEA88C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -89,18 +87,6 @@ Global
{53904BB5-68B2-497A-93BD-46423FBD239C}.Release|x64.Build.0 = Release|Any CPU
{53904BB5-68B2-497A-93BD-46423FBD239C}.Release|x86.ActiveCfg = Release|Any CPU
{53904BB5-68B2-497A-93BD-46423FBD239C}.Release|x86.Build.0 = Release|Any CPU
{D201E3A0-AE64-41AB-B9CB-3A06D0DEA88C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D201E3A0-AE64-41AB-B9CB-3A06D0DEA88C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D201E3A0-AE64-41AB-B9CB-3A06D0DEA88C}.Debug|x64.ActiveCfg = Debug|Any CPU
{D201E3A0-AE64-41AB-B9CB-3A06D0DEA88C}.Debug|x64.Build.0 = Debug|Any CPU
{D201E3A0-AE64-41AB-B9CB-3A06D0DEA88C}.Debug|x86.ActiveCfg = Debug|Any CPU
{D201E3A0-AE64-41AB-B9CB-3A06D0DEA88C}.Debug|x86.Build.0 = Debug|Any CPU
{D201E3A0-AE64-41AB-B9CB-3A06D0DEA88C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D201E3A0-AE64-41AB-B9CB-3A06D0DEA88C}.Release|Any CPU.Build.0 = Release|Any CPU
{D201E3A0-AE64-41AB-B9CB-3A06D0DEA88C}.Release|x64.ActiveCfg = Release|Any CPU
{D201E3A0-AE64-41AB-B9CB-3A06D0DEA88C}.Release|x64.Build.0 = Release|Any CPU
{D201E3A0-AE64-41AB-B9CB-3A06D0DEA88C}.Release|x86.ActiveCfg = Release|Any CPU
{D201E3A0-AE64-41AB-B9CB-3A06D0DEA88C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
5 changes: 4 additions & 1 deletion examples/BookstoreSimulator/BookstoreSimulator.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<Nullable>disable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

Expand All @@ -12,6 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.9" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.5.0" />
Expand All @@ -20,6 +21,8 @@
<PackageReference Include="FluentValidation" Version="11.6.0" />
<PackageReference Include="Dapper.Contrib" Version="2.0.78" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.0" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>

</Project>
4 changes: 3 additions & 1 deletion examples/BookstoreSimulator/Controllers/DatabasesController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ public DatabasesController(DB db)

[AllowAnonymous]
[HttpPut]
public async Task PreparedDB()
public Task PreparedDB()
{
_db.CleanTables();
_db.CreateTables();

return Task.CompletedTask;
}
}
}
6 changes: 3 additions & 3 deletions examples/BookstoreSimulator/Controllers/UsersController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class UsersController : ControllerBase
private readonly JwtSetings _jwtSetings;
private readonly SingUpUserRequestValidator _singUpUserRequestValidator;
private readonly LoginUserRequestValidator _loginUserRequestValidator;

public UsersController
(UserRepository rep, JwtSetings jwtSetings,
SingUpUserRequestValidator singUpUserRequestValidator,
Expand Down Expand Up @@ -87,9 +87,9 @@ public async Task<IResult> Login([FromBody] LoginUserRequest request)
[Route("logout")]
[Authorize]
[HttpPost]
public async Task<IResult> Logout()
public Task<IResult> Logout()
{
return Results.Ok();
return Task.FromResult(Results.Ok());
}
}
}
2 changes: 1 addition & 1 deletion examples/BookstoreSimulator/Infra/DAL/UserRepository.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public async Task<DBResultExeption> InsertUser(UserDBRecord record)
}
}

public async Task<UserLoginDBRecord?> TryFindUserLoginData(string email)
public async Task<UserLoginDBRecord> TryFindUserLoginData(string email)
{
try
{
Expand Down
6 changes: 3 additions & 3 deletions examples/BookstoreSimulator/Pages/Error.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ namespace BookstoreSimulator.Pages
[IgnoreAntiforgeryToken]
public class ErrorModel : PageModel
{
public string? RequestId { get; set; }
public string RequestId { get; set; }

public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
public bool ShowRequestId => string.IsNullOrEmpty(RequestId);

private readonly ILogger<ErrorModel> _logger;

Expand All @@ -24,4 +24,4 @@ public void OnGet()
RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
}
}
}
}
8 changes: 4 additions & 4 deletions examples/BookstoreSimulator/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ public static void Main(string[] args)
IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(jwtSetings.Key))
};
});

var settings = builder.Configuration.GetSection("BookstoreSettings").Get<BookstoreSettings>();

builder.Services.AddSingleton(_ => new UserRepository(settings, logger));
builder.Services.AddSingleton(_ => new BookRepository(settings, logger));
builder.Services.AddSingleton(_ => new BookRepository(settings, logger));
builder.Services.AddSingleton(_ => new OrderRepository(settings, logger));
builder.Services.AddSingleton(_ => new DB(settings, logger));
builder.Services.AddSingleton(_ => new SingUpUserRequestValidator());
Expand All @@ -115,8 +115,8 @@ public static void Main(string[] args)
{
OnPrepareResponse = context =>
{
context.Context.Response.Headers.Add("Cache-Control", "no-cache, no-store");
context.Context.Response.Headers.Add("Expires", "-1");
context.Context.Response.Headers.Append("Cache-Control", "no-cache, no-store");
context.Context.Response.Headers.Append("Expires", "-1");
}
});

Expand Down
12 changes: 6 additions & 6 deletions examples/Demo/Demo.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@
<PackageReference Include="Dapper.Contrib" Version="2.0.78" />
<PackageReference Include="LiteDB" Version="5.0.15" />

<PackageReference Include="NBomber" Version="5.8.1" />
<PackageReference Include="NBomber" Version="5.8.2" />
<PackageReference Include="NBomber.Data" Version="5.0.0" />
<PackageReference Include="NBomber.Http" Version="5.2.0" />
<PackageReference Include="NBomber.MQTT" Version="0.2.0" />
<PackageReference Include="NBomber.Sinks.Timescale" Version="0.6.1" />
<PackageReference Include="NBomber.WebBrowser" Version="0.1.0" />
<PackageReference Include="NBomber.Http" Version="5.2.1" />
<PackageReference Include="NBomber.MQTT" Version="0.2.1" />
<PackageReference Include="NBomber.Sinks.Timescale" Version="0.6.2" />
<PackageReference Include="NBomber.WebBrowser" Version="0.1.1" />
<PackageReference Include="NBomber.WebSockets" Version="0.1.0" />
<PackageReference Include="NBomber.Sinks.InfluxDB" Version="5.1.0" />
<PackageReference Include="NBomber.Sinks.InfluxDB" Version="5.1.1" />

<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
Expand Down
4 changes: 2 additions & 2 deletions examples/Demo/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
// -------------------------------
// ----- Hello World examples -----
// -------------------------------
new HelloWorldExample().Run();
// new HelloWorldExample().Run();
// new ScenarioWithInit().Run();
// new ScenarioWithSteps().Run();
// new StepsShareData().Run();
Expand Down Expand Up @@ -65,7 +65,7 @@
// new InfluxDBReportingExample().Run();
// new TimescaleDBReportingExample().Run();
// new CustomReportingExample().Run();
// new NBomberStudioReportingExample().Run();
new NBomberStudioReportingExample().Run();

// ---- Logs ----
// new TextFileLogger().Run();
Expand Down
6 changes: 3 additions & 3 deletions examples/WebAppSimulator/Pages/Error.cshtml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ namespace WebAppSimulator.Pages
[IgnoreAntiforgeryToken]
public class ErrorModel : PageModel
{
public string? RequestId { get; set; }
public string RequestId { get; set; }

public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
public bool ShowRequestId => string.IsNullOrEmpty(RequestId);

private readonly ILogger<ErrorModel> _logger;

Expand All @@ -24,4 +24,4 @@ public void OnGet()
RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
}
}
}
}
2 changes: 1 addition & 1 deletion examples/WebAppSimulator/WebAppSimulator.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<Nullable>disable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions examples/xUnitExample/xUnitExample.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="NBomber" Version="5.8.1" />
<PackageReference Include="NBomber.Http" Version="5.2.0" />
<PackageReference Include="NBomber" Version="5.8.2" />
<PackageReference Include="NBomber.Http" Version="5.2.1" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
2 changes: 2 additions & 0 deletions src/NBomber/NBomber.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MessagePack" Version="2.5.192" />
<PackageReference Include="NBomber.Contracts" Version="[4.2.0-beta.2]" />
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="FsToolkit.ErrorHandling.TaskResult" Version="2.13.0" />
Expand All @@ -85,6 +86,7 @@
<PackageReference Include="ConsoleTables" Version="2.4.2" />
<PackageReference Include="Serilog.Sinks.SpectreConsole" Version="[0.3.3]" />
<PackageReference Update="FSharp.Core" Version="7.0.0" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\HtmlReport\assets\js\index.js" />
Expand Down
8 changes: 0 additions & 8 deletions tests/NBomber.IntegrationTests/AssemblyInfo.fs
View file

This file was deleted.

95 changes: 0 additions & 95 deletions tests/NBomber.IntegrationTests/CliArgsTests.fs
View file

This file was deleted.

Loading

0 comments on commit 8aaa5dd

Please sign in to comment.