- r moved lambda

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/inline/inline_options.py

@@ -1,3 +1,9 @@
+from pathlib import Path
+
+PREVIOUS_RESULT_ = "vvvvv PREVIOUS RESULT vvvvv\n"
+
+DELETE_ME_TO_APPROVE_ = "\n***** DELETE ME TO APPROVE *****"
+
 class InlineOptions:
 
     @staticmethod
@@ -55,11 +61,17 @@ def previous_capture():
         from approvaltests.namer.inline_python_reporter import InlinePythonReporter
         from approvaltests.reporters import ReporterThatAutomaticallyApproves
 
+        def applesauce(approved_path):
+            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
+            return DELETE_ME_TO_APPROVE_ + previous_result_stuff()
         class SemiAutomaticInlineOptions(InlineOptions):
             def apply(self, options: "Options") -> "Options":
                 return options.with_reporter(
                     InlinePythonReporter(
-                        ReporterThatAutomaticallyApproves(), add_approval_line=False, previous_result=True
+                        ReporterThatAutomaticallyApproves(), add_approval_line=False, previous_result=applesauce
                     )
                 )
 

approvaltests/namer/inline_python_reporter.py

@@ -20,14 +20,8 @@ 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()
-        def applesauce():
-            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
-            return DELETE_ME_TO_APPROVE_ + previous_result_stuff()
         if self.previous_result:
-            self.semi_automatic_extra_line = applesauce()
+            self.semi_automatic_extra_line = self.previous_result(approved_path)
         received_path = self.create_received_file(received_path, test_source_file)
         return self.diffReporter.report(received_path, test_source_file)