From de23035e809d3e4fa681232fdfecc3943da2e16f Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane.kilkelly@overleaf.com>
Date: Tue, 29 Sep 2020 13:00:36 +0100
Subject: [PATCH] Add test for pulling ignored file

---
 .../WLGitBridgeIntegrationTest.java            | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeIntegrationTest.java b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeIntegrationTest.java
index 5aa554aab8..5ee773bede 100644
--- a/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeIntegrationTest.java
+++ b/services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeIntegrationTest.java
@@ -1027,6 +1027,24 @@ public class WLGitBridgeIntegrationTest {
       assertTrue(f.exists());
     }
 
+    @Test
+    public void canPullIgnoredFileFromOverleaf() throws IOException, InterruptedException {
+      int gitBridgePort = 33892;
+      int mockServerPort = 3892;
+      server = new MockSnapshotServer(mockServerPort, getResource("/canPullIgnoredForceAddedFile").toFile());
+      server.start();
+      server.setState(states.get("canPullIgnoredForceAddedFile").get("base"));
+      wlgb = new GitBridgeApp(new String[] {
+        makeConfigFile(gitBridgePort, mockServerPort)
+      });
+      wlgb.run();
+      File testProjDir = gitClone("testproj", gitBridgePort, dir);
+      server.setState(states.get("canPullIgnoredForceAddedFile").get("withUpdatedMainFile"));
+      gitPull(testProjDir);
+      File f = new File(testProjDir.getPath() + "/sub/one.txt");
+      assertTrue(f.exists());
+    }
+
     private String makeConfigFile(
             int port,
             int apiPort