Strip whitespace between HTML tags

Author: rachelmcr

app/src/androidTest/kotlin/org/wordpress/aztec/demo/Matchers.kt

@@ -7,16 +7,37 @@ import org.hamcrest.Matcher
 import org.hamcrest.TypeSafeMatcher
 
 object Matchers {
-    fun withRegex(regex: Regex): Matcher<View> {
+    fun withRegex(expected: Regex): Matcher<View> {
 
         return object : TypeSafeMatcher<View>() {
             override fun describeTo(description: Description) {
-                description.appendText("EditText matches $regex")
+                description.appendText("EditText matches $expected")
             }
 
             public override fun matchesSafely(view: View): Boolean {
                 if (view is EditText) {
-                    return view.text.toString().matches(regex)
+                    val regex = Regex(">\\s+<")
+                    val strippedText = view.text.toString().replace(regex, "><")
+                    return strippedText.matches(expected)
+                }
+
+                return false
+            }
+        }
+    }
+
+    fun withStrippedText(expected: String): Matcher<View> {
+
+        return object : TypeSafeMatcher<View>() {
+            override fun describeTo(description: Description) {
+                description.appendText("EditText matches $expected")
+            }
+
+            public override fun matchesSafely(view: View): Boolean {
+                if (view is EditText) {
+                    val regex = Regex(">\\s+<")
+                    val strippedText = view.text.toString().replace(regex, "><")
+                    return strippedText.equals(expected)
                 }
 
                 return false

app/src/androidTest/kotlin/org/wordpress/aztec/demo/pages/EditorPage.kt

@@ -296,8 +296,7 @@ class EditorPage : BasePage() {
     }
 
     fun verifyHTML(expected: String): EditorPage {
-
-        htmlEditor.check(matches(withText(expected)))
+        htmlEditor.check(matches(Matchers.withStrippedText(expected)))
         label("Verified expected editor contents")
 
         return this

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/MixedTextFormattingTests.kt

@@ -112,13 +112,12 @@ class MixedTextFormattingTests : BaseTest() {
     @Test
     fun testTwoHeadings() {
         val text = "some text"
-        val linebreak = "\n"
-        val html = "<h1>$text</h1>$linebreak<h2>$text</h2>"
+        val html = "<h1>$text</h1><h2>$text</h2>"
 
         EditorPage()
                 .makeHeader(EditorPage.HeadingStyle.ONE)
                 .insertText(text)
-                .insertText(linebreak)
+                .insertText("\n")
                 .makeHeader(EditorPage.HeadingStyle.TWO)
                 .insertText(text)
                 .toggleHtml()
@@ -128,13 +127,12 @@ class MixedTextFormattingTests : BaseTest() {
     @Test
     fun testEndHeadingFormatting() {
         val text = "some text"
-        val linebreak = "\n"
-        val html = "<h1>$text</h1>$linebreak$text"
+        val html = "<h1>$text</h1>\n$text"
 
         EditorPage()
                 .makeHeader(EditorPage.HeadingStyle.ONE)
                 .insertText(text)
-                .insertText(linebreak)
+                .insertText("\n")
                 .insertText(text)
                 .toggleHtml()
                 .verifyHTML(html)
@@ -143,14 +141,12 @@ class MixedTextFormattingTests : BaseTest() {
     @Test
     fun testEndQuoteFormatting() {
         val text = "some text"
-        val linebreak = "\n"
-        val html = "<blockquote>$text</blockquote>$linebreak$text"
+        val html = "<blockquote>$text</blockquote>\n$text"
 
         EditorPage()
                 .toggleQuote()
                 .insertText(text)
-                .insertText(linebreak)
-                .insertText(linebreak)
+                .insertText("\n\n")
                 .insertText(text)
                 .toggleHtml()
                 .verifyHTML(html)
@@ -159,13 +155,12 @@ class MixedTextFormattingTests : BaseTest() {
     @Test
     fun testRemoveQuoteFormatting() {
         val text = "some text"
-        val linebreak = "\n"
-        val html = "<blockquote>$text</blockquote>$linebreak$text"
+        val html = "<blockquote>$text</blockquote>\n$text"
 
         EditorPage()
                 .toggleQuote()
                 .insertText(text)
-                .insertText(linebreak)
+                .insertText("\n")
                 .insertText(text)
                 .toggleQuote()
                 .toggleHtml()
@@ -174,18 +169,14 @@ class MixedTextFormattingTests : BaseTest() {
 
     @Test
     fun testQuotedListFormatting() {
-        var text = "some text\n"
-        val regex = Regex("<blockquote>\\s+<ul>[\\S\\s]+</ul>\\s+</blockquote>")
-
-        for (i in 1..3) {
-            text += text
-        }
+        var text = "some text\nsome text\nsome text"
+        val html = "<blockquote><ul><li>some text</li><li>some text</li><li>some text</li></ul></blockquote>"
 
         EditorPage()
                 .toggleQuote()
                 .makeList(EditorPage.ListStyle.UNORDERED)
                 .insertText(text)
                 .toggleHtml()
-                .verifyHTML(regex)
+                .verifyHTML(html)
     }
 }

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/SimpleTextFormattingTests.kt

@@ -88,7 +88,7 @@ class SimpleTextFormattingTests : BaseTest() {
     fun testSimpleUnorderedListFormatting() {
         val text1 = "some\n"
         val text2 = "text"
-        val html = "$text1<ul>\n\t<li>$text2</li>\n</ul>"
+        val html = "$text1<ul><li>$text2</li></ul>"
 
         EditorPage()
                 .insertText(text1)
@@ -102,7 +102,7 @@ class SimpleTextFormattingTests : BaseTest() {
     fun testSimpleOrderedListFormatting() {
         val text1 = "some\n"
         val text2 = "text"
-        val html = "$text1<ol>\n\t<li>$text2</li>\n</ol>"
+        val html = "$text1<ol><li>$text2</li></ol>"
 
         EditorPage()
                 .insertText(text1)