WTForms 2.3.x test fixes

Author: mrjoes

flask_admin/tests/geoa/test_basic.py

@@ -98,7 +98,8 @@ def test_model():
     rv = client.get(url)
     eq_(rv.status_code, 200)
     data = rv.data.decode('utf-8')
-    ok_(r' name="multi">{"type":"MultiPoint","coordinates":[[100,0],[101,1]]}</textarea>' in data)
+    ok_(r'{"type":"MultiPoint","coordinates":[[100,0],[101,1]]}</textarea>' in data or
+        r'{&#34;type&#34;:&#34;MultiPoint&#34;,&#34;coordinates&#34;:[[100,0],[101,1]]}' in data)
 
     # rv = client.post(url, data={
     #     "name": "edited",
@@ -150,4 +151,6 @@ def test_none():
     rv = client.get(url)
     eq_(rv.status_code, 200)
     data = rv.data.decode('utf-8')
-    ok_(r' name="point"></textarea>' in data)
+    ok_(r' name="point"></textarea>' in data or
+        ' name="point">\n</textarea>' in data or
+        ' name="point">\r\n</textarea>' in data)

flask_admin/tests/mongoengine/test_basic.py

@@ -1055,8 +1055,8 @@ def test_ajax_fk():
         ok_(u'value=""' not in form.model1())
 
         form.model1.data = model
-        needle = u'data-json="["%s", "first"]"' % as_unicode(model.id)
-        ok_(needle in form.model1())
+        ok_(u'data-json="["%s", "first"]"' % as_unicode(model.id) in form.model1() or
+            u'data-json="["%s", "first"]"' % as_unicode(model.id) in form.model1())
         ok_(u'value="%s"' % as_unicode(model.id) in form.model1())
 
     # Check querying

flask_admin/tests/sqla/test_basic.py

@@ -2273,7 +2273,8 @@ def test_ajax_fk():
         ok_(u'value=""' not in form.model1())
 
         form.model1.data = model
-        ok_(u'data-json="[%s, "first"]"' % model.id in form.model1())
+        ok_(u'data-json="[%s, "first"]"' % model.id in form.model1() or
+            u'data-json="[%s, "first"]"' % model.id in form.model1())
         ok_(u'value="1"' in form.model1())
 
     # Check querying
@@ -2345,7 +2346,8 @@ class Model2(db.Model):
         ok_(u'data-json="[]"' in form.model1())
 
         form.model1.data = [model]
-        ok_(u'data-json="[[1, "first"]]"' in form.model1())
+        ok_(u'data-json="[[1, "first"]]"' in form.model1() or
+            u'data-json="[[1, "first"]]"' in form.model1())
 
     # Check submitting
     client = app.test_client()

flask_admin/tests/sqla/test_postgres.py

@@ -75,7 +75,8 @@ class JSONModel(db.Model):
     eq_(rv.status_code, 200)
     data = rv.data.decode('utf-8')
     ok_('json_test' in data)
-    ok_('>{"test_key1": "test_value1"}<' in data)
+    ok_('>{"test_key1": "test_value1"}<' in data or
+        '{&#34;test_key1&#34;: &#34;test_value1&#34;}<' in data)
 
 
 def test_citext():
@@ -111,4 +112,6 @@ class CITextModel(db.Model):
     eq_(rv.status_code, 200)
     data = rv.data.decode('utf-8')
     ok_('name="citext_test"' in data)
-    ok_('>Foo<' in data)
+    ok_('>Foo</' in data or
+        '>\nFoo</' in data or
+        '>\r\nFoo</' in data)