alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add test for reset before pull

Browse Source
This commit is contained in:
Shane Kilkelly
2020-09-24 11:24:47 +01:00
parent d07ecd2a1b
commit 935770e2ab
7 changed files with 123 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullIgnoredForceAddedFile/base/state.json
+41
View File
@@ -0,0 +1,41 @@
[
{
"project": "testproj",
"getDoc": {
"versionID": 1,
"createdAt": "2014-11-30T18:40:58.123Z",
"email": "jdleesmiller+1@gmail.com",
"name": "John+1"
},
"getSavedVers": [
{
"versionID": 1,
"comment": "init",
"email": "jdleesmiller+1@gmail.com",
"name": "John+1",
"createdAt": "2014-11-30T18:47:01.456Z"
}
],
"getForVers": [
{
"versionID": 1,
"srcs": [
{
"content": "content\n",
"path": "main.tex"
},
{
"content": "*.txt",
"path": "sub/.gitignore"
}
],
"atts": []
}
],
"push": "success",
"postback": {
"type": "success",
"versionID": 2
}
}
]
services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullIgnoredForceAddedFile/base/testproj/main.tex
+1
View File
@@ -0,0 +1 @@
content
services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullIgnoredForceAddedFile/base/testproj/sub/.gitignore
+1
View File
@@ -0,0 +1 @@
*.txt
services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullIgnoredForceAddedFile/withUpdatedMainFile/state.json
+45
View File
@@ -0,0 +1,45 @@
[
{
"project": "testproj",
"getDoc": {
"versionID": 5,
"createdAt": "2014-11-30T18:40:58.123Z",
"email": "jdleesmiller+1@gmail.com",
"name": "John+1"
},
"getSavedVers": [
{
"versionID": 5,
"comment": "init",
"email": "jdleesmiller+1@gmail.com",
"name": "John+1",
"createdAt": "2014-11-30T18:47:01.456Z"
}
],
"getForVers": [
{
"versionID": 5,
"srcs": [
{
"content": "content\nupdated\n",
"path": "main.tex"
},
{
"content": "*.txt",
"path": "sub/.gitignore"
},
{
"content": "1",
"path": "sub/one.txt"
}
],
"atts": []
}
],
"push": "success",
"postback": {
"type": "success",
"versionID": 5
}
}
]
services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullIgnoredForceAddedFile/withUpdatedMainFile/testproj/main.tex
+2
View File
@@ -0,0 +1,2 @@
content
updated
services/git-bridge/src/test/resources/uk/ac/ic/wlgitbridge/WLGitBridgeIntegrationTest/canPullIgnoredForceAddedFile/withUpdatedMainFile/testproj/sub/.gitignore
+1
View File
@@ -0,0 +1 @@
*.txt