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
This commit is contained in:
Harrison Healey
2016-07-20 17:01:52 -04:00
committed by Corey Hulen
parent 537d647846
commit b8b322c04b
2 changed files with 24 additions and 28 deletions

View File

@@ -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

View File

@@ -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",