mirror of
https://github.com/bitwarden/server.git
synced 2025-05-11 14:42:19 -05:00
Fixed merge conflicts
This commit is contained in:
parent
22eeb90ace
commit
e06ba4cbc9
@ -221,7 +221,6 @@ public class BaseRequestValidatorTests
|
|||||||
// Arrange
|
// Arrange
|
||||||
_featureService.IsEnabled(FeatureFlagKeys.PolicyRequirements).Returns(true);
|
_featureService.IsEnabled(FeatureFlagKeys.PolicyRequirements).Returns(true);
|
||||||
var context = CreateContext(tokenRequest, requestContext, grantResult);
|
var context = CreateContext(tokenRequest, requestContext, grantResult);
|
||||||
context.CustomValidatorRequestContext.CaptchaResponse.IsBot = false;
|
|
||||||
_sut.isValid = true;
|
_sut.isValid = true;
|
||||||
|
|
||||||
context.ValidatedTokenRequest.GrantType = grantType;
|
context.ValidatedTokenRequest.GrantType = grantType;
|
||||||
@ -253,7 +252,6 @@ public class BaseRequestValidatorTests
|
|||||||
// Arrange
|
// Arrange
|
||||||
_featureService.IsEnabled(FeatureFlagKeys.PolicyRequirements).Returns(true);
|
_featureService.IsEnabled(FeatureFlagKeys.PolicyRequirements).Returns(true);
|
||||||
var context = CreateContext(tokenRequest, requestContext, grantResult);
|
var context = CreateContext(tokenRequest, requestContext, grantResult);
|
||||||
context.CustomValidatorRequestContext.CaptchaResponse.IsBot = false;
|
|
||||||
_sut.isValid = true;
|
_sut.isValid = true;
|
||||||
|
|
||||||
context.ValidatedTokenRequest.GrantType = grantType;
|
context.ValidatedTokenRequest.GrantType = grantType;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user