fixed tests

Kully · Kully · commit af965d07c04f · 2017-06-26T21:46:12.000-04:00
diff --git a/plotly/figure_factory/_facet_grid.py b/plotly/figure_factory/_facet_grid.py
@@ -488,7 +488,8 @@ def _facet_grid(df, x, y, facet_row, facet_col, num_of_rows,
             type=trace_type,
             marker=dict(
                 color=marker_color,
-                line=kwargs_marker['line']
+                line=kwargs_marker['line'],
+                #opacity=kwargs_marker['opacity'],
             ),
             **kwargs_trace
         )
@@ -512,7 +513,8 @@ def _facet_grid(df, x, y, facet_row, facet_col, num_of_rows,
                 type=trace_type,
                 marker=dict(
                     color=marker_color,
-                    line=kwargs_marker['line']
+                    line=kwargs_marker['line'],
+                    #opacity=kwargs_marker['opacity'],
                 ),
                 **kwargs_trace
             )
@@ -562,7 +564,8 @@ def _facet_grid(df, x, y, facet_row, facet_col, num_of_rows,
                     type=trace_type,
                     marker=dict(
                         color=marker_color,
-                        line=kwargs_marker['line']
+                        line=kwargs_marker['line'],
+                        #opacity=kwargs_marker['opacity'],
                     ),
                     **kwargs_trace
                 )
@@ -812,7 +815,7 @@ def create_facet_grid(df, x=None, y=None, facet_row=None, facet_col=None,
 
     if 'opacity' not in kwargs_marker:
         if not ggplot2:
-            kwargs_marker['opacity'] = 0.75
+            kwargs_trace['opacity'] = 0.6
 
     if 'line' not in kwargs_marker:
         if not ggplot2:
diff --git a/plotly/tests/test_optional/test_figure_factory.py b/plotly/tests/test_optional/test_figure_factory.py
@@ -1935,6 +1935,19 @@ def test_data_must_be_dataframe(self):
                                 ff.create_facet_grid,
                                 data, 'a', 'b')
 
+    def test_x_and_y_for_scatter(self):
+        data = pd.DataFrame([[0, 0], [1, 1]], columns=['a', 'b'])
+
+        pattern = (
+            "You need to input 'x' and 'y' if you are you are using a "
+            "trace_type of 'scatter' or 'scattergl'."
+        )
+
+        self.assertRaisesRegexp(PlotlyError, pattern,
+                                ff.create_facet_grid,
+                                data, 'a')
+
+
     def test_valid_col_selection(self):
         data = pd.DataFrame([[0, 0], [1, 1]], columns=['a', 'b'])
 
@@ -2017,10 +2030,11 @@ def test_valid_facet_grid_fig(self):
         )
 
         exp_facet_grid = {
-            'data': [{'marker': {'color': 'rgba(31, 119, 180, 0.5)',
+            'data': [{'marker': {'color': 'rgb(31, 119, 180)',
                 'line': {'color': 'darkgrey', 'width': 1},
                 'size': 8},
                'mode': 'markers',
+               'opacity': 0.6,
                'type': 'scatter',
                'x': [1.8,
                     1.8,
@@ -2038,10 +2052,11 @@ def test_valid_facet_grid_fig(self):
                     16,
                     20],
                'yaxis': 'y1'},
-              {'marker': {'color': 'rgba(31, 119, 180, 0.5)',
+              {'marker': {'color': 'rgb(31, 119, 180)',
                 'line': {'color': 'darkgrey', 'width': 1},
                 'size': 8},
                'mode': 'markers',
+               'opacity': 0.6,
                'type': 'scatter',
                'x':     [2.8,
                    2.8,
