- F fully working previous result

Co-Authored-By: jmasonlee <262853+jmasonlee@users.noreply.github.com>
Co-Authored-By: Gregor Riegler <rieglerg85@gmail.com>
Co-Authored-By: blade290 <43077216+blade290@users.noreply.github.com>
Co-Authored-By: Nitsan Avni <nitsanav@gmail.com>
Co-Authored-By: bhargavgundu <7643639+bhargavgundu@users.noreply.github.com>

Author: 6 people

approvaltests/namer/inline_python_reporter.py

@@ -5,6 +5,8 @@
 from approvaltests import Reporter, StackFrameNamer
 from approvaltests.inline.split_code import SplitCode
 
+PREVIOUS_RESULT_ = "vvvvv PREVIOUS RESULT vvvvv\n"
+
 DELETE_ME_TO_APPROVE_ = "\n***** DELETE ME TO APPROVE *****"
 
 
@@ -18,8 +20,12 @@ def __init__(self, reporter, add_approval_line=False, previous_result=None):
 
     def report(self, received_path: str, approved_path: str) -> bool:
         test_source_file = self.get_test_source_file()
+       
         if self.previous_result:
-            previous_result_stuff = lambda: "\n" + "vvvvv PREVIOUS RESULT vvvvv" + "\n" + "41"
+            approved_text = Path(approved_path).read_text()
+            approved_text = approved_text.rsplit("\n", 1)[0]
+            approved_text = approved_text.rsplit(PREVIOUS_RESULT_, 1)[-1]
+            previous_result_stuff = lambda: "\n" + PREVIOUS_RESULT_ + approved_text
             self.semi_automatic_extra_line = DELETE_ME_TO_APPROVE_ + previous_result_stuff()
         received_path = self.create_received_file(received_path, test_source_file)
         return self.diffReporter.report(received_path, test_source_file)

tests/approved_files/test_inline_approvals.test_inline_with_preserved_approved_text.approved.txt

@@ -0,0 +1,4 @@
+42
+***** DELETE ME TO APPROVE *****
+vvvvv PREVIOUS RESULT vvvvv
+41

tests/test_inline_approvals.py

@@ -196,22 +196,9 @@ def test_inline_with_preserved_approved_text():
     vvvvv PREVIOUS RESULT vvvvv
     41
     """
-    this_is_the_docstring_we_want = remove_indentation_from("""
-    42
-    ***** DELETE ME TO APPROVE *****
-    vvvvv PREVIOUS RESULT vvvvv
-    41
-    """)
-    
-    
-    # 1. Run a failing inline approval with a new configuration
-    # 2. Capture whatever we've overwriting the docstring with
-    # 3. Capture the last docstring so we can write it to previous result 
-    # 4. Check that the overwriting string is equal to the docstring we want
     options = Options().inline(InlineOptions.previous_capture())
     try:
         verify("42", options=options)
     except ApprovalException:
         pass
-    # assert that the docstring is equal to the string we want
-    assert get_approved_via_doc_string() == this_is_the_docstring_we_want
+    verify(get_approved_via_doc_string())