Merge pull request #857 from Wadeck/adapt-tests-for-2.204.6

Adapt the test for recent core
jenkinsci · Mar 29, 2020 · 5b3300d · 5b3300d
2 parents cc33ed0 + 965e00f
commit 5b3300d
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/src/test/java/hudson/plugins/git/GitStatusCrumbExclusionTest.java b/src/test/java/hudson/plugins/git/GitStatusCrumbExclusionTest.java
@@ -2,7 +2,9 @@
 
 import hudson.security.csrf.CrumbFilter;
 
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -32,6 +34,23 @@ public class GitStatusCrumbExclusionTest {
     private HttpServletResponse resp;
     private FilterChain chain;
 
+    private static String systemPropertyPreviousValue;
+
+    @BeforeClass
+    public static void setProps() {
+        systemPropertyPreviousValue = System.getProperty("hudson.security.csrf.CrumbFilter.UNPROCESSED_PATHINFO");
+        System.setProperty("hudson.security.csrf.CrumbFilter.UNPROCESSED_PATHINFO", "true");
+    }
+
+    @AfterClass
+    public static void unsetProps() {
+        if (systemPropertyPreviousValue == null) {
+            System.clearProperty("hudson.security.csrf.CrumbFilter.UNPROCESSED_PATHINFO");
+        } else {
+            System.setProperty("hudson.security.csrf.CrumbFilter.UNPROCESSED_PATHINFO", systemPropertyPreviousValue);
+        }
+    }
+
     @Before
     public void before() {
         filter = new CrumbFilter();