Merge branch 'master' into PLT-1429

3 files changed, 69 insertions, 15 deletions

diff --git a/doc/developer/tests/test-attachments.md b/doc/developer/tests/test-attachments.md
index 71cc496ce..e2fda0eb6 100644
--- a/doc/developer/tests/test-attachments.md
+++ b/doc/developer/tests/test-attachments.md
@@ -29,7 +29,7 @@ Expected: Scaled thumbnail & preview window
 
 **GIF**  
 `Images/GIF.gif`  
-Expected: Scaled thumbnail & preview window. Click to play GIF.  
+Expected: Scaled thumbnail & preview window. GIF should auto-play in the preview window.  
 [Permalink](https://pre-release.mattermost.com/core/pl/j49fowdkstr57g3ed9bgpfoo5w)
 
 **TIFF**  
@@ -72,37 +72,37 @@ Expected: Generic Word thumbnail & preview window.
 
 **MP4**  
 `Videos/MP4.mp4`  
-Expected: Generic video thumbnail & playable preview window  
+Expected: Generic video thumbnail & playable preview window. View Permalink.  
 [Permalink](https://pre-release.mattermost.com/core/pl/5dx5qx9t9brqfnhohccxjynx7c)
 
 **AVI**  
 `Videos/AVI.avi`  
-Expected: View Permalink. Expected depends on the operating system, browser and plugins.  
+Expected: Generic video thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins.  
 [Permalink](https://pre-release.mattermost.com/core/pl/qwn9eiy7j3rkjyruxhcugpogdw)
 
 **MKV**  
 `Videos/MKV.mkv`  
-Expected: View Permalink. Expected depends on the operating system, browser and plugins.  
+Expected: Generic video thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins.  
 [Permalink](https://pre-release.mattermost.com/core/pl/tszyjkr1cidhxjgiusa4mde3ja)
 
 **MOV**  
 `Videos/MOV.mov`  
-Expected: View Permalink. Expected depends on the operating system, browser and plugins.  
+Expected: Generic video thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins.  
 [Permalink](https://pre-release.mattermost.com/core/pl/ienzppz5i3f7tbt5jiujn8uuir)
 
 **MPG**  
 `Videos/MPG.mpg`  
-Expected: View Permalink. Expected depends on the operating system, browser and plugins.  
+Expected: Generic video thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins.  
 [Permalink](https://pre-release.mattermost.com/core/pl/skggdq1hfpritc6c88bi481p5a)
 
 **Webm**  
 `Videos/WEBM.webm`  
-Expected: View Permalink. Expected depends on the operating system, browser and plugins.  
+Expected: Generic video thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins.  
 [Permalink](https://pre-release.mattermost.com/core/pl/7h8tysuxgfgsxeht3sbn7e4h6y)
 
 **WMV**  
 `Videos/WMV.wmv`  
-Expected: View Permalink. Expected depends on the operating system, browser and plugins.  
+Expected: Generic video thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins.  
 [Permalink](https://pre-release.mattermost.com/core/pl/kaom7j7uyjra7bzhrre6qwdrbw)
 
 ### Audio
@@ -112,7 +112,6 @@ Expected: View Permalink. Expected depends on the operating system, browser and
 Expected: Generic audio thumbnail & playable preview window  
 [Permalink](https://pre-release.mattermost.com/core/pl/if4gn8dbrjgx8fmqmkukzefyme)
 
-
 **M4A**  
 `Audio/M4a.m4a`  
 Expected: Generic audio thumbnail & playable preview window  
@@ -120,25 +119,25 @@ Expected: Generic audio thumbnail & playable preview window
 
 **AAC**  
 `Audio/AAC.aac`  
-Expected: View Permalink. Expected depends on the operating system, browser and plugins.  
+Expected: Generic audio thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins.  
 [Permalink](https://pre-release.mattermost.com/core/pl/3naoy5pr5tydbk1m6yo1ast9ny)
 
 **FLAC**  
 `Audio/FLAC.flac`  
-Expected: View Permalink. Expected depends on the operating system, browser and plugins.  
+Expected: Generic audio thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins.  
 [Permalink](https://pre-release.mattermost.com/core/pl/kf4cmy44dfya5efmse7rg43eih)
 
 **OGG**  
 `Audio/OGG.ogg`  
-Expected: View Permalink. Expected depends on the operating system, browser and plugins.  
+Expected: Generic audio thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins.  
 [Permalink](https://pre-release.mattermost.com/core/pl/dezrcpbxapyexe77rjuzkrp63r)
 
 **WAV**  
 `Audio/WAV.wav`  
-Expected: View Permalink. Expected depends on the operating system, browser and plugins.  
+Expected: Generic audio thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins.  
 [Permalink](https://pre-release.mattermost.com/core/pl/pdkxx1udepdnbmi9j8kyas5xbh)
 
 **WMA**  
 `Audio/WMA.wma`  
-Expected: View Permalink. Expected depends on the operating system, browser and plugins.  
+Expected: Generic audio thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins.  
 [Permalink](https://pre-release.mattermost.com/core/pl/756wrmdd57dcig3m4emypp6i1h)
diff --git a/doc/developer/tests/test-markdown-basics.md b/doc/developer/tests/test-markdown-basics.md
index 7a46adeb0..cea9a0867 100644
--- a/doc/developer/tests/test-markdown-basics.md
+++ b/doc/developer/tests/test-markdown-basics.md
@@ -18,6 +18,18 @@ Normal Text_
 _Normal Text  
 _Normal Text*
 
+### Carriage Return  
+
+**The following text should render as:**  
+Line #1 followed by Line #2  
+Line #2 followed by one blank line
+
+Line #3 followed by one blank line
+
+
+Line #4 following one blank line  
+
+
 ### Code Blocks
 
 ```
@@ -119,7 +131,7 @@ Text below line
 
 **The following markdown should render within the block quote:**  
 > #### Heading 4  
-> _Italics_, *Italics*, **Bold**, ***Bold-italics***, **Bold-italics_**, ~~Strikethrough~~  
+> _Italics_, *Italics*, **Bold**, ***Bold-italics***, **_Bold-italics_**, ~~Strikethrough~~  
 > :) :-) ;) :-O :bamboo: :gift_heart: :dolls:  
 
 **The following text should render in two block quotes separated by one line of text:**
diff --git a/doc/developer/tests/test-search.md b/doc/developer/tests/test-search.md
new file mode 100644
index 000000000..0f0ba1153
--- /dev/null
+++ b/doc/developer/tests/test-search.md
@@ -0,0 +1,43 @@
+# Search Testing
+
+### Basic Search Testing
+
+This post is used by the core team to test search. It should be returned for the test cases for search, with proper highlighting in the search results. 
+
+**Basic word search:** Hello world!  
+**Emoji search:** :strawberry:  
+**Accent search:** Crème friache  
+**Non-latin search:**  
+您好吗  
+您好  
+**Email search:** person@domain.org  
+**Link search:** www.dropbox.com  
+**Markdown search:**  
+##### Hello  
+```  
+Hello  
+```  
+`Hello`  
+
+
+### Hashtags:
+
+Click on the linked hashtags below, and confirm that the search results match the linked hashtags. Confirm that the highlighting in the search results is correct. 
+
+#### Basic Hashtags
+
+#hello #world
+
+#### Hashtags containing punctuation:
+
+*Note: Make a separate post containing only the word “hashtag”, and confirm the hashtags below do not return the separate post.*
+
+#hashtag #hashtag-dash #hashtag_underscore #hashtag.dot
+
+#### Punctuation following a hashtag:
+
+#colon: #slash/ #backslash\ #percent% #dollar$ #semicolon; #ampersand&  #bracket( #bracket) #lessthan< #greaterthan> #dash- #plus+ #equals=  #caret^ #hashtag# #asterisk* #verticalbar| #invertedquestion¿ #atsign@ #quote” #apostrophe' #curlybracket{ #curlybracket} #squarebracket[ #squarebracket] 
+
+#### Markdown surrounding a hashtag:
+
+*#markdown-hashtag*