Merge pull request #58 from datacamp/bf/extras-markdown

[CP-902] Multiline code block support

protowhat/Reporter.py

@@ -95,4 +95,8 @@ def build_final_payload(self):
 
     @staticmethod
     def to_html(msg):
-        return re.sub("<p>(.*)</p>", "\\1", markdown2.markdown(msg)).strip()
+        return re.sub(
+            "<p>(.*)</p>",
+            "\\1",
+            markdown2.markdown(msg, extras=["fenced-code-blocks", "code-friendly"]),
+        ).strip()

protowhat/__init__.py

@@ -1 +1 @@
-__version__ = "2.1.2"
+__version__ = "2.1.3"

requirements.txt

@@ -1,5 +1,6 @@
 # protowhat deps
-markdown2~=2.3.10
+markdown2==2.4.6
+Pygments==2.13.0
 jinja2~=2.11.3
 markupsafe==2.0.1
 

tests/test_reporter.py

@@ -145,3 +145,39 @@ def test_highlighting_path_no_position():
     expected_payload = {"correct": False, "message": "msg", "path": "test.py"}
 
     assert payload == expected_payload
+
+
+def test_reporter_code_block():
+    r = Reporter()
+    msg = "Expected \n```\n{{sol_str}}\n```\n, but got \n```\n{{stu_str}}\n```\n"
+    code = """
+while True:
+    car_wash_num += 1
+
+    # Get the current simulation time and clock-in the process time
+    yield env.timeout(5)"""
+    fmt_kwargs = {"sol_str": code, "stu_str": code}
+    f = Feedback(FeedbackComponent(msg, fmt_kwargs))
+
+    payload = r.build_failed_payload(f)
+    expected_message = """Expected 
+
+<pre><code>
+while True:
+    car_wash_num += 1
+
+    # Get the current simulation time and clock-in the process time
+    yield env.timeout(5)
+</code></pre>
+
+, but got 
+
+<pre><code>
+while True:
+    car_wash_num += 1
+
+    # Get the current simulation time and clock-in the process time
+    yield env.timeout(5)
+</code></pre>"""
+
+    assert payload["message"] == expected_message