Fix some type failures in function tests not seeing the field type change

Author: adamchainz

tests/testapp/test_functions.py

@@ -511,35 +511,39 @@ def test_json_length_type(self):
     def test_json_insert(self):
         self.obj.attrs = JSONInsert("attrs", {"$.int": 99, "$.int2": 102})
         self.obj.save()
-        self.obj.refresh_from_db()
-        assert self.obj.attrs["int"] == 88
-        assert self.obj.attrs["int2"] == 102
+
+        obj = JSONModel.objects.get()
+        assert obj.attrs["int"] == 88
+        assert obj.attrs["int2"] == 102
 
     def test_json_insert_expression(self):
         self.obj.attrs = JSONInsert("attrs", {Value("$.int"): Value(99)})
         self.obj.save()
-        self.obj.refresh_from_db()
-        assert self.obj.attrs["int"] == 88
+
+        obj = JSONModel.objects.get()
+        assert obj.attrs["int"] == 88
 
     def test_json_insert_dict(self):
         self.obj.attrs = JSONInsert(
             "attrs", {"$.sub": {"paper": "drop"}, "$.sub2": {"int": 42, "foo": "bar"}}
         )
         self.obj.save()
-        self.obj.refresh_from_db()
-        assert self.obj.attrs["sub"] == {"document": "store"}
-        assert self.obj.attrs["sub2"]["int"] == 42
-        assert self.obj.attrs["sub2"]["foo"] == "bar"
+
+        obj = JSONModel.objects.get()
+        assert obj.attrs["sub"] == {"document": "store"}
+        assert obj.attrs["sub2"]["int"] == 42
+        assert obj.attrs["sub2"]["foo"] == "bar"
 
     def test_json_insert_array(self):
         self.obj.attrs = JSONInsert(
             "attrs", {"$.arr": [1, "two", 3], "$.arr2": ["one", 2]}
         )
         self.obj.save()
-        self.obj.refresh_from_db()
-        assert self.obj.attrs["arr"] == ["dee", "arr", "arr"]
-        assert self.obj.attrs["arr2"][0] == "one"
-        assert self.obj.attrs["arr2"][1] == 2
+
+        obj = JSONModel.objects.get()
+        assert obj.attrs["arr"] == ["dee", "arr", "arr"]
+        assert obj.attrs["arr2"][0] == "one"
+        assert obj.attrs["arr2"][1] == 2
 
     def test_json_insert_empty_data(self):
         with pytest.raises(ValueError) as excinfo:
@@ -549,27 +553,30 @@ def test_json_insert_empty_data(self):
     def test_json_replace_pairs(self):
         self.obj.attrs = JSONReplace("attrs", {"$.int": 101, "$.int2": 102})
         self.obj.save()
-        self.obj.refresh_from_db()
-        assert self.obj.attrs["int"] == 101
-        assert "int2" not in self.obj.attrs
+
+        obj = JSONModel.objects.get()
+        assert obj.attrs["int"] == 101
+        assert "int2" not in obj.attrs
 
     def test_json_replace_dict(self):
         self.obj.attrs = JSONReplace(
             "attrs", {"$.sub": {"paper": "drop"}, "$.sub2": {"int": 42, "foo": "bar"}}
         )
         self.obj.save()
-        self.obj.refresh_from_db()
-        assert self.obj.attrs["sub"] == {"paper": "drop"}
-        assert "sub2" not in self.obj.attrs
+
+        obj = JSONModel.objects.get()
+        assert obj.attrs["sub"] == {"paper": "drop"}
+        assert "sub2" not in obj.attrs
 
     def test_json_replace_array(self):
         self.obj.attrs = JSONReplace(
             "attrs", {"$.arr": [1, "two", 3], "$.arr2": ["one", 2]}
         )
         self.obj.save()
-        self.obj.refresh_from_db()
-        assert self.obj.attrs["arr"] == [1, "two", 3]
-        assert "arr2" not in self.obj.attrs
+
+        obj = JSONModel.objects.get()
+        assert obj.attrs["arr"] == [1, "two", 3]
+        assert "arr2" not in obj.attrs
 
     def test_json_replace_empty_data(self):
         with pytest.raises(ValueError) as excinfo:
@@ -580,29 +587,32 @@ def test_json_set_pairs(self):
         with print_all_queries():
             self.obj.attrs = JSONSet("attrs", {"$.int": 101, "$.int2": 102})
             self.obj.save()
-            self.obj.refresh_from_db()
-            assert self.obj.attrs["int"] == 101
-            assert self.obj.attrs["int2"] == 102
+
+            obj = JSONModel.objects.get()
+            assert obj.attrs["int"] == 101
+            assert obj.attrs["int2"] == 102
 
     def test_json_set_dict(self):
         self.obj.attrs = JSONSet(
             "attrs", {"$.sub": {"paper": "drop"}, "$.sub2": {"int": 42, "foo": "bar"}}
         )
         self.obj.save()
-        self.obj.refresh_from_db()
-        assert self.obj.attrs["sub"] == {"paper": "drop"}
-        assert self.obj.attrs["sub2"]["int"] == 42
-        assert self.obj.attrs["sub2"]["foo"] == "bar"
+
+        obj = JSONModel.objects.get()
+        assert obj.attrs["sub"] == {"paper": "drop"}
+        assert obj.attrs["sub2"]["int"] == 42
+        assert obj.attrs["sub2"]["foo"] == "bar"
 
     def test_json_set_array(self):
         self.obj.attrs = JSONSet(
             "attrs", {"$.arr": [1, "two", 3], "$.arr2": ["one", 2]}
         )
         self.obj.save()
-        self.obj.refresh_from_db()
-        assert self.obj.attrs["arr"] == [1, "two", 3]
-        assert self.obj.attrs["arr2"][0] == "one"
-        assert self.obj.attrs["arr2"][1] == 2
+
+        obj = JSONModel.objects.get()
+        assert obj.attrs["arr"] == [1, "two", 3]
+        assert obj.attrs["arr2"][0] == "one"
+        assert obj.attrs["arr2"][1] == 2
 
     def test_json_set_complex_data(self):
         data = {
@@ -618,8 +628,9 @@ def test_json_set_complex_data(self):
         }
         self.obj.attrs = JSONSet("attrs", {"$.data": data})
         self.obj.save()
-        self.obj.refresh_from_db()
-        assert self.obj.attrs["data"] == data
+
+        obj = JSONModel.objects.get()
+        assert obj.attrs["data"] == data
 
     def test_json_set_empty_data(self):
         with pytest.raises(ValueError) as excinfo:
@@ -631,9 +642,10 @@ def test_json_array_append(self):
             "attrs", {"$.arr": "max", "$.arr[0]": 1.1, "$.sub.document": 3}
         )
         self.obj.save()
-        self.obj.refresh_from_db()
-        assert self.obj.attrs["arr"] == [["dee", 1.1], "arr", "arr", "max"]
-        assert self.obj.attrs["sub"]["document"] == ["store", 3]
+
+        obj = JSONModel.objects.get()
+        assert obj.attrs["arr"] == [["dee", 1.1], "arr", "arr", "max"]
+        assert obj.attrs["sub"]["document"] == ["store", 3]
 
 
 class RegexpFunctionTests(TestCase):