Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-04 10:18:48 +02:00
Code Issues Packages Projects Releases Activity

Merge pull request #1062 from scm-manager/snyk-upgrade-18f00f2333223a63a95c08fe0448bffd

Browse Source 
[Snyk] Upgrade org.assertj:assertj-core from 3.10.0 to 3.15.0
This commit is contained in:
René Pfeuffer
2020-03-20 12:27:35 +01:00
committed by GitHub
parent 254a33c1c7 f5cfd0ca68
commit b579b3f808
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -358,7 +358,7 @@
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.10.0</version>
<version>3.15.0</version>
<scope>test</scope>
</dependency>

2
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java
View File

@@ -224,7 +224,7 @@ public class GitConfigResourceTest {
assertThat(configurationStoreCaptor.getValue())
.isInstanceOfSatisfying(GitRepositoryConfig.class, x -> { })
.extracting("defaultBranch")
.containsExactly("new");
.isEqualTo("new");
}
private MockHttpResponse get() throws URISyntaxException {

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperTest.java
View File

@@ -53,8 +53,8 @@ public class ChangesetCollectionToDtoMapperTest {
assertThat(collectionDto.getEmbedded().getItemsBy("branch"))
.hasSize(1)
.first().matches(b -> b.getLinks().getLinkBy("self").isPresent())
.extracting(b -> b.getLinks().getLinkBy("self").get().getHref()).first().isEqualTo("/v2/repositories/space/name/branches/someBranch");
.extracting(b -> b.getLinks().getLinkBy("self").get().getHref()).isEqualTo("/v2/repositories/space/name/branches/someBranch");
assertThat(collectionDto.getEmbedded().getItemsBy("branch"))
.first().extracting("name").first().isEqualTo("someBranch");
.first().extracting("name").isEqualTo("someBranch");
}
}

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapperTest.java
View File

@@ -55,7 +55,7 @@ class DiffResultToDiffResultDtoMapperTest {
.isPresent()
.get()
.extracting("href")
.contains("/scm/api/v2/repositories/space/X/diff/123/parsed");
.isEqualTo("/scm/api/v2/repositories/space/X/diff/123/parsed");
}
@Test
@@ -67,7 +67,7 @@ class DiffResultToDiffResultDtoMapperTest {
.isPresent()
.get()
.extracting("href")
.contains("/scm/api/v2/repositories/space/X/incoming/feature%2Fsome/master/diff/parsed");
.isEqualTo("/scm/api/v2/repositories/space/X/incoming/feature%2Fsome/master/diff/parsed");
}
private DiffResult createResult() {