Skip to content

Commit

Permalink
Update unit tests for render_kw (#40)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Nagy committed Oct 21, 2023
1 parent f8bc55a commit a291309
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions tests/test_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
class LazySelect:
def __call__(self, field, **kwargs):
return list(
(val, str(label), selected) for val, label, selected in field.iter_choices()
(val, str(label), selected, render_kw) for val, label, selected, render_kw in field.iter_choices()
)


Expand Down Expand Up @@ -111,7 +111,7 @@ class F(Form):
form.a.query = sess.query(self.Test)
self.assertTrue(form.a.data is not None)
self.assertEqual(form.a.data.id, 1)
self.assertEqual(form.a(), [("1", "apple", True), ("2", "banana", False)])
self.assertEqual(form.a(), [("1", "apple", True, {}), ("2", "banana", False, {})])
self.assertTrue(form.validate())

form = F(a=sess.query(self.Test).filter_by(name="banana").first())
Expand Down Expand Up @@ -144,28 +144,28 @@ class F(Form):

form = F()
self.assertEqual(form.a.data, None)
self.assertEqual(form.a(), [("1", "apple", False), ("2", "banana", False)])
self.assertEqual(form.a(), [("1", "apple", False, {}), ("2", "banana", False, {})])
self.assertEqual(form.b.data, None)
self.assertEqual(
form.b(),
[
("__None", "", True),
("hello1", "apple", False),
("hello2", "banana", False),
("__None", "", True, {}),
("hello1", "apple", False, {}),
("hello2", "banana", False, {}),
],
)
self.assertFalse(form.validate())

form = F(DummyPostData(a=["1"], b=["hello2"]))
self.assertEqual(form.a.data.id, 1)
self.assertEqual(form.a(), [("1", "apple", True), ("2", "banana", False)])
self.assertEqual(form.a(), [("1", "apple", True, {}), ("2", "banana", False, {})])
self.assertEqual(form.b.data.baz, "banana")
self.assertEqual(
form.b(),
[
("__None", "", False),
("hello1", "apple", False),
("hello2", "banana", True),
("__None", "", False, {}),
("hello1", "apple", False, {}),
("hello2", "banana", True, {}),
],
)
self.assertTrue(form.validate())
Expand All @@ -174,11 +174,11 @@ class F(Form):
sess.add(self.Test(id=3, name="meh"))
sess.flush()
sess.commit()
self.assertEqual(form.a(), [("1", "apple", True), ("2", "banana", False)])
self.assertEqual(form.a(), [("1", "apple", True, {}), ("2", "banana", False, {})])
form.a._object_list = None
self.assertEqual(
form.a(),
[("1", "apple", True), ("2", "banana", False), ("3", "meh", False)],
[("1", "apple", True, {}), ("2", "banana", False, {}), ("3", "meh", False, {})],
)

# Test bad data
Expand Down Expand Up @@ -217,14 +217,14 @@ def test_single_value_without_factory(self):
form = self.F(DummyPostData(a=["1"]))
form.a.query = self.sess.query(self.Test)
self.assertEqual([1], [v.id for v in form.a.data])
self.assertEqual(form.a(), [("1", "apple", True), ("2", "banana", False)])
self.assertEqual(form.a(), [("1", "apple", True, {}), ("2", "banana", False, {})])
self.assertTrue(form.validate())

def test_multiple_values_without_query_factory(self):
form = self.F(DummyPostData(a=["1", "2"]))
form.a.query = self.sess.query(self.Test)
self.assertEqual([1, 2], [v.id for v in form.a.data])
self.assertEqual(form.a(), [("1", "apple", True), ("2", "banana", True)])
self.assertEqual(form.a(), [("1", "apple", True, {}), ("2", "banana", True, {})])
self.assertTrue(form.validate())

form = self.F(DummyPostData(a=["1", "3"]))
Expand All @@ -245,7 +245,7 @@ class F(Form):

form = F()
self.assertEqual([v.id for v in form.a.data], [2])
self.assertEqual(form.a(), [("1", "apple", False), ("2", "banana", True)])
self.assertEqual(form.a(), [("1", "apple", False, {}), ("2", "banana", True, {})])
self.assertTrue(form.validate())


Expand Down

0 comments on commit a291309

Please sign in to comment.