Commit 631db18c authored by Greg Messner's avatar Greg Messner
Browse files

Now tests Diff using an array.

parent 4dabe711
...@@ -127,8 +127,8 @@ public class TestGitLabApiBeans { ...@@ -127,8 +127,8 @@ public class TestGitLabApiBeans {
@Test @Test
public void testDiff() throws Exception { public void testDiff() throws Exception {
Diff diff = unmarshalResource(Diff.class, "diff.json"); List<Diff> diffs = unmarshalResourceList(Diff.class, "diff.json");
assertTrue(compareJson(diff, "diff.json")); assertTrue(compareJson(diffs, "diff.json"));
} }
@Test @Test
......
{ [
"diff": "--- a/doc/update/5.4-to-6.0.html\n+++ b/doc/update/5.4-to-6.0.html\n@@ -71,6 +71,8 @@\n sudo -u git -H bundle exec rake migrate_keys RAILS_ENV=production\n sudo -u git -H bundle exec rake migrate_inline_notes RAILS_ENV=production\n \n+sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production\n+\n ```\n \n ### 6. Update config files", {
"new_path": "doc/update/5.4-to-6.0.html", "old_path":"core/src/main/java/codereview/service/data/XxxDAO.java",
"old_path": "doc/update/5.4-to-6.0.html", "new_path":"core/src/main/java/codereview/service/data/XxxDAO.java",
"a_mode": null, "a_mode":"100644",
"b_mode": "100644", "b_mode":"100644",
"new_file": false, "new_file":false,
"renamed_file": false, "renamed_file":false,
"deleted_file": false "deleted_file":false,
} "diff":"@@ -114,5 +114,13 @@ diff content here \n"
},
{ "old_path":"core/src/main/java/codereview/service/data/XxxService.java",
"new_path":"core/src/main/java/codereview/service/data/XxxService.java",
"a_mode":"100644",
"b_mode":"100644",
"new_file":false,
"renamed_file":false,
"deleted_file":false,
"diff":"@@ -5,6 +5,7 @@ diff content here\n"
}
]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment