Bye travis.

services/git-bridge/.travis.yml

@@ -1 +0,0 @@
-language: java

services/git-bridge/src/test/java/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest.java

@@ -326,13 +326,13 @@ public class WLGitBridgeIntegrationTest {
         File testprojDir = new File(dir, "testproj");
         assertEquals(0, exitCode);
         assertTrue(FileUtil.gitDirectoriesAreEqual(getResource("/pushFailsOnFirstStageOutOfDate/state/testproj"), testprojDir.toPath()));
-        runtime.exec("git config push.default simple", null, testprojDir);
         runtime.exec("touch push.tex", null, testprojDir).waitFor();
         runtime.exec("git add -A", null, testprojDir).waitFor();
         runtime.exec("git commit -m \"push\"", null, testprojDir).waitFor();
         Process gitPush = runtime.exec("git push", null, testprojDir);
-        gitPush.waitFor();
+        int pushExitCode = gitPush.waitFor();
         wlgb.stop();
+        assertEquals(1, pushExitCode);
         assertEquals(EXPECTED_OUT_PUSH_OUT_OF_DATE_FIRST, Util.fromStream(gitPush.getErrorStream(), 2));
     }
 
@@ -361,13 +361,13 @@ public class WLGitBridgeIntegrationTest {
         File testprojDir = new File(dir, "testproj");
         assertEquals(0, exitCode);
         assertTrue(FileUtil.gitDirectoriesAreEqual(getResource("/pushFailsOnSecondStageOutOfDate/state/testproj"), testprojDir.toPath()));
-        runtime.exec("git config push.default simple", null, testprojDir);
         runtime.exec("touch push.tex", null, testprojDir).waitFor();
         runtime.exec("git add -A", null, testprojDir).waitFor();
         runtime.exec("git commit -m \"push\"", null, testprojDir).waitFor();
         Process gitPush = runtime.exec("git push", null, testprojDir);
-        gitPush.waitFor();
+        int pushExitCode = gitPush.waitFor();
         wlgb.stop();
+        assertEquals(1, pushExitCode);
         assertEquals(EXPECTED_OUT_PUSH_OUT_OF_DATE_SECOND, Util.fromStream(gitPush.getErrorStream(), 2));
     }
 

services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/pushFailsOnInvalidFiles/state/state.json

@@ -0,0 +1,45 @@
+[
+	{
+		"project": "testproj",
+		"getDoc": {
+			"versionID": 1,
+			"createdAt": "2014-11-30T18:40:58.123Z",
+			"email": "jdleesmiller+1@gmail.com",
+			"name": "John+1"
+		},
+		"getSavedVers": [
+        	{
+        		"versionID": 1,
+        		"comment": "added more info on doc GET and error details",
+        		"email": "jdleesmiller+1@gmail.com",
+        		"name": "John+1",
+        		"createdAt": "2014-11-30T18:47:01.333Z"
+        	}
+		],
+		"getForVers": [
+			{
+				"versionID": 1,
+				"srcs": [
+                    {
+                    	"content": "content\n",
+                    	"path": "main.tex"
+                    },
+                    {
+                    	"content": "This text is from another file.",
+                    	"path": "foo/bar/test.tex"
+                    }
+	            ],
+	            "atts": [
+	            	{
+	            		"url": "http://127.0.0.1:3868/state/testproj/min_mean_wait_evm_7_eps_150dpi.png",
+	            		"path": "min_mean_wait_evm_7_eps_150dpi.png"
+	            	}
+	            ]
+	        }
+		],
+		"push": "outOfDate",
+		"postback": {
+			"type": "outOfDate"
+		}
+	}
+]

services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/pushFailsOnInvalidFiles/state/testproj/foo/bar/test.tex

@@ -0,0 +1 @@
+This text is from another file.

services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/pushFailsOnInvalidFiles/state/testproj/main.tex

@@ -0,0 +1 @@
+content