a few edge cases around comments and trailing slashes in assert statements

Author: dannysepler

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. This projec
 
 ## [Unreleased]
 
+## [1.0.7] - September 16th 2021
+
+- Another edge case involving multi-line comments and trailing slashes
+
 ## [1.0.6] - September 16th 2021
 
 - Fix edge case where commas in multiline asserts don't have trailing slashes but should

pytestify/fixes/asserts.py

@@ -200,7 +200,7 @@ def add_slashes(call: Call, content_list: List[str]) -> None:
     for i in range(call.line, call.end_line):
         line = content_list[i]
 
-        if line.endswith(',') and comma and comma.line - 1 == i:
+        if line.endswith(',') and comma and comma.line == i - call.line + 1:
             # this is on multiline asserts with an error message
             # otherwise, the comma is probably between elements in a sequence
             pass

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pytestify
-version = 1.0.6
+version = 1.0.7
 description = Automatically convert unittests to pytest
 long_description = file: README.md
 long_description_content_type = text/markdown

tests/fixes/test_asserts.py

@@ -165,6 +165,32 @@ def test_rewrite_complex_asserts(before, after):
             '   b, \\\n'
             "   'Error'",
         ),
+        (
+            '# some comment\n'
+            'self.assertEquals(\n'
+            '   a,\n'
+            '   b,\n'
+            "   msg='Error'\n"
+            ')',
+            '# some comment\n'
+            'assert a == \\\n'
+            '   b, \\\n'
+            "   'Error'",
+        ),
+        (
+            '# some comment\n'
+            '# some other comment\n'
+            'self.assertEquals(\n'
+            '   a,\n'
+            '   b,\n'
+            "   msg='Error'\n"
+            ')',
+            '# some comment\n'
+            '# some other comment\n'
+            'assert a == \\\n'
+            '   b, \\\n'
+            "   'Error'",
+        ),
         (
             'self.assertEquals(\n'
             '   a,  # some comment\n'