added unit test

apache · Dec 2, 2021 · 2ea8580 · 2ea8580
1 parent 446314c
commit 2ea8580
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 8 deletions.
diff --git a/superset-frontend/src/SqlLab/components/App/index.jsx b/superset-frontend/src/SqlLab/components/App/index.jsx
@@ -37,8 +37,6 @@ import QuerySearch from '../QuerySearch';
 class App extends React.PureComponent {
   constructor(props) {
     super(props);
-    console.log('this is App');
-    console.log(props);
     this.state = {
       hash: window.location.hash,
     };

diff --git a/superset-frontend/src/SqlLab/components/SqlEditor/index.jsx b/superset-frontend/src/SqlLab/components/SqlEditor/index.jsx
@@ -616,7 +616,6 @@ class SqlEditor extends React.PureComponent {
         )}
       </Menu>
     );
-
     return (
       <StyledToolbar className="sql-toolbar" id="js-sql-toolbar">
         <div className="leftItems">

diff --git a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.jsx b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.jsx
@@ -75,7 +75,6 @@ const userOS = detectOS();
 class TabbedSqlEditors extends React.PureComponent {
   constructor(props) {
     super(props);
-    console.log('this is the tabbed', props);
     const sqlLabUrl = '/superset/sqllab';
     this.state = {
       sqlLabUrl,
@@ -94,8 +93,6 @@ class TabbedSqlEditors extends React.PureComponent {
 
   componentDidMount() {
     // migrate query editor and associated tables state to server
-    console.log('we here boys');
-    console.log(this.props);
     if (isFeatureEnabled(FeatureFlag.SQLLAB_BACKEND_PERSISTENCE)) {
       const localStorageTables = this.props.tables.filter(
         table => table.inLocalStorage,
@@ -437,7 +434,6 @@ TabbedSqlEditors.propTypes = propTypes;
 TabbedSqlEditors.defaultProps = defaultProps;
 
 function mapStateToProps({ sqlLab, common, requestedQuery }) {
-  console.log(sqlLab);
   return {
     databases: sqlLab.databases,
     queryEditors: sqlLab.queryEditors,

diff --git a/superset-frontend/src/SqlLab/reducers/getInitialState.js b/superset-frontend/src/SqlLab/reducers/getInitialState.js
@@ -85,7 +85,6 @@ export default function getInitialState({
         functionNames: [],
         schema: activeTab.schema,
         queryLimit: activeTab.query_limit,
-        remoteId: activeTab.remoteId,
         validationResult: {
           id: null,
           errors: [],

diff --git a/tests/integration_tests/charts/commands_tests.py b/tests/integration_tests/charts/commands_tests.py
@@ -68,6 +68,7 @@ def test_export_chart_command(self, mock_g):
         metadata = yaml.safe_load(
             contents[f"charts/Energy_Sankey_{example_chart.id}.yaml"]
         )
+
         assert metadata == {
             "slice_name": "Energy Sankey",
             "viz_type": "sankey",
@@ -85,6 +86,49 @@ def test_export_chart_command(self, mock_g):
             "version": "1.0.0",
         }
 
+    @patch("superset.security.manager.g")
+    @pytest.mark.usefixtures("load_energy_table_with_slice")
+    def test_export_chart_with_query_context(self, mock_g):
+        """Test that charts that have a query_context are exported correctly"""
+
+        mock_g.user = security_manager.find_user("alpha")
+        example_chart = db.session.query(Slice).filter_by(slice_name="Heatmap").one()
+        command = ExportChartsCommand([example_chart.id])
+
+        contents = dict(command.run())
+
+        expected = [
+            "metadata.yaml",
+            f"charts/Heatmap_{example_chart.id}.yaml",
+            "datasets/examples/energy_usage.yaml",
+            "databases/examples.yaml",
+        ]
+        assert expected == list(contents.keys())
+
+        metadata = yaml.safe_load(contents[f"charts/Heatmap_{example_chart.id}.yaml"])
+
+        assert metadata == {
+            "slice_name": "Heatmap",
+            "viz_type": "heatmap",
+            "params": {
+                "all_columns_x": "source",
+                "all_columns_y": "target",
+                "canvas_image_rendering": "pixelated",
+                "collapsed_fieldsets": "",
+                "linear_color_scheme": "blue_white_yellow",
+                "metric": "sum__value",
+                "normalize_across": "heatmap",
+                "slice_name": "Heatmap",
+                "viz_type": "heatmap",
+                "xscale_interval": "1",
+                "yscale_interval": "1",
+            },
+            "cache_timeout": None,
+            "dataset_uuid": str(example_chart.table.uuid),
+            "uuid": str(example_chart.uuid),
+            "version": "1.0.0",
+        }
+
     @patch("superset.security.manager.g")
     @pytest.mark.usefixtures("load_energy_table_with_slice")
     def test_export_chart_command_no_access(self, mock_g):

diff --git a/tests/integration_tests/fixtures/energy_dashboard.py b/tests/integration_tests/fixtures/energy_dashboard.py
@@ -173,5 +173,6 @@ def _get_energy_slices():
                 "xscale_interval": "1",
                 "yscale_interval": "1",
             },
+            "query_context": '{"datasource":{"id":12,"type":"table"},"force":false,"queries":[{"time_range":" : ","filters":[],"extras":{"time_grain_sqla":null,"having":"","having_druid":[],"where":""},"applied_time_extras":{},"columns":[],"metrics":[],"annotation_layers":[],"row_limit":5000,"timeseries_limit":0,"order_desc":true,"url_params":{},"custom_params":{},"custom_form_data":{}}],"result_format":"json","result_type":"full"}',
         },
     ]