Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions debug_toolbar/panels/history/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ def history_refresh(request):

if form.is_valid():
requests = []
# Convert to list to handle mutations happenening in parallel
for id, toolbar in list(DebugToolbar._store.items())[::-1]:
# Convert to list to handle mutations happening in parallel
for id, toolbar in list(DebugToolbar._store.items()):
requests.append(
{
"id": id,
Expand Down
22 changes: 15 additions & 7 deletions tests/panels/test_history.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,16 +143,24 @@ def test_history_sidebar_expired_store_id(self):

def test_history_refresh(self):
"""Verify refresh history response has request variables."""
data = {"foo": "bar"}
self.client.get("/json_view/", data, content_type="application/json")
data = {"store_id": "foo"}
response = self.client.get(reverse("djdt:history_refresh"), data=data)
self.client.get("/json_view/", {"foo": "bar"}, content_type="application/json")
self.client.get(
"/json_view/", {"spam": "eggs"}, content_type="application/json"
)

response = self.client.get(
reverse("djdt:history_refresh"), data={"store_id": "foo"}
)
self.assertEqual(response.status_code, 200)
data = response.json()
self.assertEqual(len(data["requests"]), 1)
self.assertEqual(len(data["requests"]), 2)

store_id = list(DebugToolbar._store)[0]
self.assertIn(html.escape(store_id), data["requests"][0]["content"])
store_ids = list(DebugToolbar._store)
self.assertIn(html.escape(store_ids[0]), data["requests"][0]["content"])
self.assertIn(html.escape(store_ids[1]), data["requests"][1]["content"])

for val in ["foo", "bar"]:
self.assertIn(val, data["requests"][0]["content"])

for val in ["spam", "eggs"]:
self.assertIn(val, data["requests"][1]["content"])