Fix body matcher again.

praw-dev · Apr 11, 2015 · afb2e87 · afb2e87
1 parent abc9cc7
commit afb2e87
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -42,14 +42,20 @@
 USER_AGENT = 'PRAW_test_suite'
 
 
-class ByteBodyMatcher(BaseMatcher):
+class BodyMatcher(BaseMatcher):
     name = 'ByteBody'
 
     def match(self, request, recorded_request):
-        recorded_request = deserialize_prepared_request(recorded_request)
-        return recorded_request.body == (request.body or b'')
+        prev_body = deserialize_prepared_request(recorded_request).body
+        if not prev_body and not request.body:
+            return True
 
-Betamax.register_request_matcher(ByteBodyMatcher)
+        def parts(params):
+            return sorted(params.split('&'))
+
+        return parts(prev_body) == parts(request.body)
+
+Betamax.register_request_matcher(BodyMatcher)
 
 
 with Betamax.configure() as config: