finished tests and added comment for 512 height, width defaults

Kully · Kully · commit 43ae1d0f20b3 · 2017-10-25T19:06:41.000-04:00
diff --git a/plotly/presentation_objs/presentation_objs.py b/plotly/presentation_objs/presentation_objs.py
@@ -63,6 +63,7 @@ def list_of_options(iterable, conj='and', period=True):
     template = (len(iterable) - 2)*'{}, ' + '{} ' + conj + ' {}' + period*'.'
     return template.format(*iterable)
 
+
 # Error Messages
 STYLE_ERROR = "Your presentation style must be {}".format(
     list_of_options(PRES_THEMES, conj='or', period=True)
@@ -88,6 +89,7 @@ def list_of_options(iterable, conj='and', period=True):
     )
 )
 
+
 def _generate_id(size):
     letters_and_numbers = string.ascii_letters
     for num in range(10):
@@ -208,6 +210,8 @@ def _box(boxtype, text_or_url, left, top, height, width, id, props_attr,
         )
 
     elif boxtype == 'Image':
+        # height, width are set to default 512
+        # as set by the Presentation Editor
         props = {
             'height': 512,
             'imageName': None,
@@ -1017,8 +1021,10 @@ def _markdown_to_presentation(self, markdown_string, style, imgStretch):
 
             (specs_for_boxes, specs_for_title, specs_for_text, bkgd_color,
              title_style_attr, text_style_attr,
-             code_theme) = _return_layout_specs(num_of_boxes, url_lines,
-                title_lines, text_block, code_blocks, slide_num, style)
+             code_theme) = _return_layout_specs(
+                num_of_boxes, url_lines, title_lines, text_block, code_blocks,
+                slide_num, style
+            )
 
             # background color
             self._color_background(bkgd_color, slide_num)
diff --git a/plotly/tests/test_core/test_spectacle_presentation/test_spectacle_presentation.py b/plotly/tests/test_core/test_spectacle_presentation/test_spectacle_presentation.py
@@ -53,37 +53,10 @@ def test_invalid_code_language(self):
 
 
     def test_expected_pres(self):
-        md_string = """
-        # title
-        ---
-        transition: zoom, fade, fade
-        # Colors
-        Colors are everywhere around us.
-        Plotly(https://plot.ly/~AdamKulidjian/3564/)
-        Image(https://raw.githubusercontent.com/jackparmer/gradient-backgrounds/master/moods1.png)
-        ```python
-        x=1
-        ```
-        ---
-        Plotly(https://plot.ly/~AdamKulidjian/3564/)
-        Plotly(https://plot.ly/~AdamKulidjian/3564/)
-        Plotly(https://plot.ly/~AdamKulidjian/3564/)
-        Plotly(https://plot.ly/~AdamKulidjian/3564/)
-        Plotly(https://plot.ly/~AdamKulidjian/3564/)
-        Plotly(https://plot.ly/~AdamKulidjian/3564/)
-        Plotly(https://plot.ly/~AdamKulidjian/3564/)
-        ---
-        """
-
-        markdown_string = """
-        # things
-        happy happy joy joy
-        ---
-        # yes
-        """
+        markdown_string = "# title\n---\ntransition: zoom, fade, fade\n# Colors\nColors are everywhere around us.\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nImage(https://raw.githubusercontent.com/jackparmer/gradient-backgrounds/master/moods1.png)\n```python\nx=1\n```\n---\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\nPlotly(https://plot.ly/~AdamKulidjian/3564/)\n---\n"
 
         my_pres = pres.Presentation(
-            md_string, style='moods', imgStretch=False
+            markdown_string, style='moods', imgStretch=False
         )
 
         exp_pres = {'presentation': {'paragraphStyles': {'Body': {'color': '#000016',
@@ -358,9 +331,33 @@ def test_expected_pres(self):
                 exp_pres['presentation'][k]
             )
 
-        #self.assertEqual(
-        #    my_pres['presentation']['slides'][0],
-        #    exp_pres['presentation']['slides'][0]
-        #)
+        self.assertEqual(
+            len(my_pres['presentation']['slides']),
+            len(exp_pres['presentation']['slides'])
+        )
+
+        for slide_idx in range(len(my_pres['presentation']['slides'])):
+            childs = my_pres['presentation']['slides'][slide_idx]['children']
+            # transitions and background color
+            self.assertEqual(
+                my_pres['presentation']['slides'][slide_idx]['props'],
+                exp_pres['presentation']['slides'][slide_idx]['props']
+            )
+            for child_idx in range(len(childs)):
+                # check urls
+                if (my_pres['presentation']['slides'][slide_idx]['children']
+                    [child_idx]['type'] in ['Image', 'Plotly']):
+                    self.assertEqual(
+                        (my_pres['presentation']['slides'][slide_idx]
+                         ['children'][child_idx]['props']),
+                        (exp_pres['presentation']['slides'][slide_idx]
+                         ['children'][child_idx]['props'])
+                    )
 
-        self.assertEqual(len(my_pres['presentation']['slides']), 1)
+                # styles in children
+                self.assertEqual(
+                    (my_pres['presentation']['slides'][slide_idx]
+                     ['children'][child_idx]['props']),
+                    (exp_pres['presentation']['slides'][slide_idx]
+                     ['children'][child_idx]['props'])
+                )
