serv/surwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update tests

Browse source
This commit is contained in:
Magnus Hoff 2017-11-20 16:48:31 +01:00
parent a09aa4b601
commit 0f835fa312
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/state.rs
View file

@ -600,13 +600,13 @@ mod test {
let article = state.create_article(None, "Title".into(), "a".into(), None).unwrap(); let article = state.create_article(None, "Title".into(), "a".into(), None).unwrap();
state.update_article(article.article_id, article.revision, article.title.clone(), "b".into(), None).unwrap().unwrap(); let first_edit = state.update_article(article.article_id, article.revision, article.title.clone(), "b".into(), None).unwrap().unwrap();
let conflict_edit = state.update_article(article.article_id, article.revision, article.title.clone(), "c".into(), None).unwrap(); let conflict_edit = state.update_article(article.article_id, article.revision, article.title.clone(), "c".into(), None).unwrap();
match conflict_edit { match conflict_edit {
UpdateResult::Success(..) => panic!("Expected conflict"), UpdateResult::Success(..) => panic!("Expected conflict"),
UpdateResult::RebaseConflict(RebaseConflict { base_revision, title, body }) => { UpdateResult::RebaseConflict(RebaseConflict { base_article, title, body }) => {
assert_eq!(article.revision, base_revision); assert_eq!(first_edit.revision, base_article.revision);
assert_eq!(title, merge::MergeResult::Clean(article.title.clone())); assert_eq!(title, merge::MergeResult::Clean(article.title.clone()));
assert_eq!(body, merge::MergeResult::Conflicted(vec![ assert_eq!(body, merge::MergeResult::Conflicted(vec![
merge::Output::Conflict(vec!["c"], vec!["a"], vec!["b"]), merge::Output::Conflict(vec!["c"], vec!["a"], vec!["b"]),