From 0e7a88d0d66bfd871b12d192c737aad864871b7e Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Fri, 20 Mar 2020 01:00:09 +0000
Subject: [PATCH 1/2] fix: upgrade org.assertj:assertj-core from 3.10.0 to
 3.15.0

Snyk has created this PR to upgrade org.assertj:assertj-core from 3.10.0 to 3.15.0.

See this package in NPM:
https://www.npmjs.com/package/org.assertj:assertj-core

See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/4ac22872-f5a6-4220-bfe8-e6e5bf4c5fcb?utm_source=github&utm_medium=upgrade-pr
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9143814968..816f8e034f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
 

From f5cfd0ca6874423908fe3c17c5abb07285890403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 20 Mar 2020 11:44:28 +0100
Subject: [PATCH 2/2] Adapt unit test to new mockito api

---
 .../sonia/scm/api/v2/resources/GitConfigResourceTest.java     | 2 +-
 .../api/v2/resources/ChangesetCollectionToDtoMapperTest.java  | 4 ++--
 .../api/v2/resources/DiffResultToDiffResultDtoMapperTest.java | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java
index a561914b42..b0cada14b1 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/api/v2/resources/GitConfigResourceTest.java
@@ -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 {
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperTest.java
index 7653fbe122..8748be3a7e 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetCollectionToDtoMapperTest.java
@@ -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");
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapperTest.java
index da78d3b652..f19e66fbae 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResultToDiffResultDtoMapperTest.java
@@ -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() {