Home Explore Help
Sign In
221V
/
Misago
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fix #746: tests for setting parsed content's metadata on parsing_result

Rafał Pitoń 8 years ago
parent
2a5fdf821c
commit
3a6024524b
2 changed files with 35 additions and 2 deletions
Unified View Show Diff Stats
  1. 2 2
      misago/markup/parser.py
  2. 33 0
      misago/markup/tests/test_parser.py

+ 2 - 2
misago/markup/parser.py
View File 

@@ -55,8 +55,8 @@ def parse(
 
         'markdown': md,
 
         'markdown': md,
 
         'mentions': [],
 
         'mentions': [],
 
         'images': [],
 
         'images': [],
 
-        'outgoing_links': [],
 
         'internal_links': [],
 
         'internal_links': [],
 
+        'outgoing_links': [],
 
     }
 
     }
 
 
 
     # Parse text
 
     # Parse text
 
@@ -176,7 +176,7 @@ def clean_links(request, result, force_shva=False):
 
             result['images'].append(img['src'])
 
             result['images'].append(img['src'])
 
             img['src'] = clean_attachment_link(img['src'], force_shva)
 
             img['src'] = clean_attachment_link(img['src'], force_shva)
 
         else:
 
         else:
 
-            result['images'].append(img['src'])
 
+            result['images'].append(clean_link_prefix(img['src']))
 
 
 
     # [6:-7] trims <body></body> wrap
 
     # [6:-7] trims <body></body> wrap
 
     result['parsed_text'] = six.text_type(soup.body)[6:-7]
 
     result['parsed_text'] = six.text_type(soup.body)[6:-7]

+ 33 - 0
misago/markup/tests/test_parser.py
View File 

@@ -138,6 +138,9 @@ Lorem ipsum: http://test.com
 
 
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         self.assertEqual(expected_result, result['parsed_text'])
 
         self.assertEqual(expected_result, result['parsed_text'])
 
+        self.assertEqual(result['internal_links'], ['/'])
 
+        self.assertEqual(result['images'], [])
 
+        self.assertEqual(result['outgoing_links'], [])
 
 
 
     def test_clean_schemaless_link(self):
 
     def test_clean_schemaless_link(self):
 
         """clean_links step cleans test.com"""
 
         """clean_links step cleans test.com"""
 
@@ -151,6 +154,9 @@ Lorem ipsum: test.com
 
 
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         self.assertEqual(expected_result, result['parsed_text'])
 
         self.assertEqual(expected_result, result['parsed_text'])
 
+        self.assertEqual(result['internal_links'], ['/'])
 
+        self.assertEqual(result['images'], [])
 
+        self.assertEqual(result['outgoing_links'], [])
 
 
 
     def test_trim_current_path(self):
 
     def test_trim_current_path(self):
 
         """clean_links step leaves http://test.com path"""
 
         """clean_links step leaves http://test.com path"""
 
@@ -164,6 +170,9 @@ Lorem ipsum: http://test.com/somewhere-something/
 
 
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         self.assertEqual(expected_result, result['parsed_text'])
 
         self.assertEqual(expected_result, result['parsed_text'])
 
+        self.assertEqual(result['internal_links'], ['/somewhere-something/'])
 
+        self.assertEqual(result['images'], [])
 
+        self.assertEqual(result['outgoing_links'], [])
 
 
 
     def test_clean_outgoing_link_domain(self):
 
     def test_clean_outgoing_link_domain(self):
 
         """clean_links step leaves outgoing domain link"""
 
         """clean_links step leaves outgoing domain link"""
 
@@ -177,6 +186,9 @@ Lorem ipsum: http://somewhere.com
 
 
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         self.assertEqual(expected_result, result['parsed_text'])
 
         self.assertEqual(expected_result, result['parsed_text'])
 
+        self.assertEqual(result['outgoing_links'], ['http://somewhere.com'])
 
+        self.assertEqual(result['images'], [])
 
+        self.assertEqual(result['internal_links'], [])
 
 
 
     def test_trim_outgoing_path(self):
 
     def test_trim_outgoing_path(self):
 
         """clean_links step leaves outgoing link domain and path"""
 
         """clean_links step leaves outgoing link domain and path"""
 
@@ -190,6 +202,9 @@ Lorem ipsum: http://somewhere.com/somewhere-something/
 
 
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         self.assertEqual(expected_result, result['parsed_text'])
 
         self.assertEqual(expected_result, result['parsed_text'])
 
+        self.assertEqual(result['outgoing_links'], ['http://somewhere.com/somewhere-something/'])
 
+        self.assertEqual(result['images'], [])
 
+        self.assertEqual(result['internal_links'], [])
 
 
 
     def test_clean_local_image_src(self):
 
     def test_clean_local_image_src(self):
 
         """clean_links step cleans local image src"""
 
         """clean_links step cleans local image src"""
 
@@ -203,6 +218,9 @@ Lorem ipsum: http://somewhere.com/somewhere-something/
 
 
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         self.assertEqual(expected_result, result['parsed_text'])
 
         self.assertEqual(expected_result, result['parsed_text'])
 
+        self.assertEqual(result['images'], ['/image.jpg'])
 
+        self.assertEqual(result['internal_links'], [])
 
+        self.assertEqual(result['outgoing_links'], [])
 
 
 
     def test_clean_remote_image_src(self):
 
     def test_clean_remote_image_src(self):
 
         """clean_links step cleans remote image src"""
 
         """clean_links step cleans remote image src"""
 
@@ -216,6 +234,9 @@ Lorem ipsum: http://somewhere.com/somewhere-something/
 
 
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         self.assertEqual(expected_result, result['parsed_text'])
 
         self.assertEqual(expected_result, result['parsed_text'])
 
+        self.assertEqual(result['images'], ['somewhere.com/image.jpg'])
 
+        self.assertEqual(result['internal_links'], [])
 
+        self.assertEqual(result['outgoing_links'], [])
 
 
 
     def test_clean_linked_image(self):
 
     def test_clean_linked_image(self):
 
         """parser handles image element nested in link"""
 
         """parser handles image element nested in link"""
 
@@ -229,6 +250,9 @@ Lorem ipsum: http://somewhere.com/somewhere-something/
 
 
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         self.assertEqual(expected_result, result['parsed_text'])
 
         self.assertEqual(expected_result, result['parsed_text'])
 
+        self.assertEqual(result['images'], ['/a/thumb/test/43/'])
 
+        self.assertEqual(result['internal_links'], ['/a/test/43/'])
 
+        self.assertEqual(result['outgoing_links'], [])
 
 
 
     def test_force_shva(self):
 
     def test_force_shva(self):
 
         """parser appends ?shva=1 bit to attachment links if flag is present"""
 
         """parser appends ?shva=1 bit to attachment links if flag is present"""
 
@@ -242,6 +266,9 @@ Lorem ipsum: http://somewhere.com/somewhere-something/
 
 
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True, force_shva=True)
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True, force_shva=True)
 
         self.assertEqual(expected_result, result['parsed_text'])
 
         self.assertEqual(expected_result, result['parsed_text'])
 
+        self.assertEqual(result['images'], ['/a/thumb/test/43/'])
 
+        self.assertEqual(result['internal_links'], [])
 
+        self.assertEqual(result['outgoing_links'], [])
 
 
 
     def test_remove_shva(self):
 
     def test_remove_shva(self):
 
         """parser removes ?shva=1 bit from attachment links if flag is absent"""
 
         """parser removes ?shva=1 bit from attachment links if flag is absent"""
 
@@ -255,6 +282,9 @@ Lorem ipsum: http://somewhere.com/somewhere-something/
 
 
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         self.assertEqual(expected_result, result['parsed_text'])
 
         self.assertEqual(expected_result, result['parsed_text'])
 
+        self.assertEqual(result['images'], ['/a/thumb/test/43/?shva=1'])
 
+        self.assertEqual(result['internal_links'], [])
 
+        self.assertEqual(result['outgoing_links'], [])
 
 
 
 
 
 class LinkifyTests(TestCase):
 
 class LinkifyTests(TestCase):
 
@@ -270,6 +300,9 @@ Lorem ipsum: `<http://test.com>`
 
 
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         result = parse(test_text, MockRequest(), MockPoster(), minify=True)
 
         self.assertEqual(expected_result, result['parsed_text'])
 
         self.assertEqual(expected_result, result['parsed_text'])
 
+        self.assertEqual(result['internal_links'], [])
 
+        self.assertEqual(result['images'], [])
 
+        self.assertEqual(result['outgoing_links'], [])
 
 
 
 
 
 class StriketroughTests(TestCase):
 
 class StriketroughTests(TestCase):