Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump system-stubs-jupiter from 1.2.0 to 2.0.1 #10135

Merged
merged 3 commits into from
Apr 23, 2022
Merged

Bump system-stubs-jupiter from 1.2.0 to 2.0.1 #10135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2e6279
Bump system-stubs-jupiter from 1.2.0 to 2.0.1
dependabot[bot] Apr 20, 2022
375491f
Bump Gradle from 7.4 to 7.4.2
chadlwilson Apr 23, 2022
cde8ed5
Disambiguate calls so Spark tests work with mockito-inline
chadlwilson Apr 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ final Map<String, String> libraries = [
spring : 'org.springframework:spring-core:4.3.30.RELEASE',
springSecurity : 'org.springframework.security:spring-security-config:4.2.20.RELEASE',
springTestJunit5 : 'com.github.sbrannen:spring-test-junit5:1.5.0',
systemStubs : 'uk.org.webcompere:system-stubs-jupiter:1.2.0',
systemStubs : 'uk.org.webcompere:system-stubs-jupiter:2.0.1',
testcontainers : 'org.testcontainers:testcontainers:1.17.1',
tinybundles : 'org.ops4j.pax.tinybundles:tinybundles:3.0.0',
tokenBucket : 'org.isomorphism:token-bucket:1.7',
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=cd5c2958a107ee7f0722004a12d0f8559b4564c34daad7df06cffd4d12a426d0
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionSha256Sum=e6d864e3b5bc05cc62041842b306383fc1fefcec359e70cebb1d470a6094ca82
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
8 changes: 3 additions & 5 deletions spark/spark-base/src/test/groovy/com/thoughtworks/go/spark/SecurityServiceTrait.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ import com.thoughtworks.go.spark.util.SecureRandom
import com.thoughtworks.go.util.SystemEnvironment
import org.junit.jupiter.api.AfterEach

import static org.mockito.ArgumentMatchers.any
import static org.mockito.ArgumentMatchers.anyString
import static org.mockito.ArgumentMatchers.eq
import static org.mockito.ArgumentMatchers.*
import static org.mockito.Mockito.mock
import static org.mockito.Mockito.when

Expand Down Expand Up @@ -91,7 +89,7 @@ trait SecurityServiceTrait {

when(securityService.isUserAdmin(username)).thenReturn(false)
when(securityService.isUserGroupAdmin(username)).thenReturn(true)
when(securityService.isUserAdminOfGroup(eq(username.username) as CaseInsensitiveString, eq(groupName))).thenReturn(true)
when(securityService.isUserAdminOfGroup(eq(username.username) as CaseInsensitiveString, eq(groupName) as String)).thenReturn(true)
when(securityService.isUserAdminOfGroup(eq(username) as Username, any(String.class))).thenReturn(true)

when(securityService.hasOperatePermissionForGroup(username.username, groupName)).thenReturn(true)
Expand All @@ -104,7 +102,7 @@ trait SecurityServiceTrait {

when(securityService.isUserAdmin(username)).thenReturn(false)
when(securityService.isUserGroupAdmin(username)).thenReturn(false)
when(securityService.isUserAdminOfGroup(eq(username.username) as CaseInsensitiveString, eq(groupName))).thenReturn(false)
when(securityService.isUserAdminOfGroup(eq(username.username) as CaseInsensitiveString, eq(groupName) as String)).thenReturn(false)

PipelineGroups groups = mock(PipelineGroups.class)
when(goConfigService.groups()).thenReturn(groups)
Expand Down