Skip to content

Commit

Permalink
Update test pkgs
Browse files Browse the repository at this point in the history
  • Loading branch information
poulad committed Sep 5, 2018
1 parent 5e621a6 commit ab5095c
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 17 deletions.
4 changes: 1 addition & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# This file is the top-most EditorConfig file
root = true

# All Files
[*]
charset = utf-8
end_of_line = lf
Expand All @@ -13,7 +12,6 @@ indent_size = 4
insert_final_newline = true
trim_trailing_whitespace = true

# C# Files
[*.cs]
csharp_align_multiline_parameter = true
csharp_align_multiline_extends_list = true
Expand All @@ -22,13 +20,13 @@ csharp_place_attribute_on_same_line = false
csharp_empty_block_style = together_same_line
csharp_space_within_single_line_array_initializer_braces = true

# Solution Files
[*.sln]
indent_style = tab

# XML Project Files
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
indent_size = 2
xml_wrap_tags_and_pi = false

# Configuration Files
[*.{json,xml,yml,config,props,targets,nuspec,resx,ruleset,vsixmanifest,vsct}]
Expand Down
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ dotnet: 2.0.0
branches:
except:
- master
script: >
cd test/UnitTests &&
dotnet test --configuration Release --list-tests &&
dotnet xunit -configuration Release -nobuild -stoponfail -verbose &&
cd - &&
cd test/IntegrationTests &&
dotnet test --configuration Release --list-tests &&
dotnet xunit -configuration Release -nobuild -stoponfail -verbose
script:
- cd test/UnitTests
- dotnet test --configuration Release --list-tests
- dotnet xunit -configuration Release -nobuild -stoponfail -verbose
- cd -
- cd test/IntegrationTests
- dotnet test --configuration Release --list-tests
- dotnet xunit -configuration Release -nobuild -stoponfail -verbose
notifications:
email: false

Expand Down
2 changes: 1 addition & 1 deletion src/Quickstart/Quickstart.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BouncyCastle" Version="1.8.2"/>
<PackageReference Include="BouncyCastle" Version="1.8.3"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Telegram.Bot.Extensions.Passport\Telegram.Bot.Extensions.Passport.csproj"/>
Expand Down
4 changes: 2 additions & 2 deletions test/IntegrationTests/IntegrationTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BouncyCastle" Version="1.8.2" />
<PackageReference Include="BouncyCastle" Version="1.8.3" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.2" />
Expand All @@ -26,4 +26,4 @@
<None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
<None Include="Files/**" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ public void Should_Decrypt_Credentials()

IDecrypter decrypter = new Decrypter();

Credentials credentials = decrypter.DecryptCredentials(encryptedCredentials: passData.Credentials, key);
Credentials credentials = decrypter.DecryptCredentials(
encryptedCredentials: passData.Credentials,
key: key
);

Assert.NotNull(credentials);
Assert.NotNull(credentials.SecureData);
Expand Down
4 changes: 2 additions & 2 deletions test/UnitTests/UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BouncyCastle" Version="1.8.2" />
<PackageReference Include="BouncyCastle" Version="1.8.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="xunit" Version="2.3.1" />
Expand All @@ -17,4 +17,4 @@
<ItemGroup>
<None Include="Files\*" CopyToOutputDirectory="Always" />
</ItemGroup>
</Project>
</Project>

0 comments on commit ab5095c

Please sign in to comment.