diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-07-20 17:01:52 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-07-20 13:01:52 -0800 |
| commit | b8b322c04b93358ace06d2687d340e45a0fe15a8 (patch) | |
| tree | 8951d1f0b69a3e4581168c3831ec355ee1bd7c55 | |
| parent | 537d647846e596e3cc6a8d7973b94c4448924a0b (diff) | |
| download | chat-b8b322c04b93358ace06d2687d340e45a0fe15a8.tar.gz chat-b8b322c04b93358ace06d2687d340e45a0fe15a8.tar.bz2 chat-b8b322c04b93358ace06d2687d340e45a0fe15a8.zip | |
PLT-3482/PLT-3551/PLT-3552 Fixed some markdown list parsing (#3637)
* PLT-3552 Partially-fixed an invalid test case
* PLT-3551 Removed an invalid test case
* PLT-3482 Added a test case for multiple lists separated by text
* PLT-3482 Updated marked to fix multiple lists separated by text
| -rw-r--r-- | tests/test-markdown-lists.md | 50 | ||||
| -rw-r--r-- | webapp/package.json | 2 |
2 files changed, 24 insertions, 28 deletions
diff --git a/tests/test-markdown-lists.md b/tests/test-markdown-lists.md index c60b0eb89..f363fe034 100644 --- a/tests/test-markdown-lists.md +++ b/tests/test-markdown-lists.md @@ -1,7 +1,7 @@ # Markdown List Testing Verify that all list types render as expected. -### Single-item Ordered List +### Single-Item Ordered List **Expected:** ``` @@ -11,7 +11,7 @@ Verify that all list types render as expected. **Actual:** 7. Single Item -### Multi-item Ordered List +### Multi-Item Ordered List **Expected:** ``` @@ -47,7 +47,7 @@ Verify that all list types render as expected. 1. Echo 1. Foxtrot -### Single-item Unordered List +### Single-Item Unordered List **Expected:** ``` @@ -57,7 +57,7 @@ Verify that all list types render as expected. **Actual:** * Single Item -### Multi-item Unordered List +### Multi-Item Unordered List **Expected:** ``` @@ -179,39 +179,20 @@ Verify that all list types render as expected. 1. One 2. Two -### Carriage Return and New Line After a List +### New Line After a List **Expected:** ``` 1. One -- Two +2. Two This text should be on a new line. ``` **Actual:** 1. One -- Two - This text should be on a new line. - -**Expected:** -``` -List: - -- One -- Two - -This line should have a line break above it. -``` - -**Actual:** - -List: - -- One -- Two - -This line should have a line break above it. +2. Two +This text should be on a new line. ### Task Lists @@ -246,3 +227,18 @@ This line should have a line break above it. 1. [ ] One 2. [ ] Two 3. [x] Completed item + +### Multiple Lists + +**Expected:** +``` +List A: +1. One +List B: +2. Two +``` + +List A: +1. One +List B: +2. Two
\ No newline at end of file diff --git a/webapp/package.json b/webapp/package.json index 3c7be4a48..651c287ef 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -16,7 +16,7 @@ "jasny-bootstrap": "3.1.3", "jquery": "3.1.0", "keymirror": "0.1.1", - "marked": "mattermost/marked#bbba29c38ea5b498561202abc376998d84e746db", + "marked": "mattermost/marked#69736482dbad685c398a5eec33a59b5ab06057ac", "match-at": "0.1.0", "object-assign": "4.1.0", "perfect-scrollbar": "0.6.12", |