More unit tests

caravel/views.py

@@ -415,7 +415,6 @@ class R(BaseView):
     def index(self, url_id):
         url = db.session.query(models.Url).filter_by(id=url_id).first()
         if url:
-            print(url.url)
             return redirect('/' + url.url)
         else:
             flash("URL to nowhere...", "danger")

caravel/viz.py

@@ -68,6 +68,7 @@ def __init__(self, datasource, form_data, slice_=None):
         if not form.validate():
             for k, v in form.errors.items():
                 if not data.get('json') and not data.get('async'):
+                    logging.error("{}: {}".format(k, " ".join(v)))
                     flash("{}: {}".format(k, " ".join(v)), 'danger')
         if previous_viz_type != self.viz_type:
             data = {

tests/core_tests.py

@@ -15,8 +15,9 @@
 
 import caravel
 from caravel import app, db, models, utils, appbuilder
+from caravel.models import DruidCluster
 
-#os.environ['CARAVEL_CONFIG'] = 'tests.caravel_test_config'
+os.environ['CARAVEL_CONFIG'] = 'tests.caravel_test_config'
 
 app.config['TESTING'] = True
 app.config['CSRF_ENABLED'] = False
@@ -26,17 +27,34 @@
 cli = imp.load_source('cli', BASE_DIR + "/bin/caravel")
 
 
-class CoreTests(unittest.TestCase):
+class CaravelTestCase(unittest.TestCase):
 
     def __init__(self, *args, **kwargs):
-        super(CoreTests, self).__init__(*args, **kwargs)
+        super(CaravelTestCase, self).__init__(*args, **kwargs)
         self.client = app.test_client()
         role_admin = appbuilder.sm.find_role('Admin')
         user = appbuilder.sm.find_user('admin')
         if not user:
             appbuilder.sm.add_user(
                 'admin', 'admin',' user', 'admin@fab.org',
                 role_admin, 'general')
+
+    def login(self):
+        self.client.post(
+            '/login/',
+            data=dict(username='admin', password='general'),
+            follow_redirects=True)
+
+
+class CoreTests(CaravelTestCase):
+
+    def __init__(self, *args, **kwargs):
+        super(CoreTests, self).__init__(*args, **kwargs)
+        self.table_ids = {tbl.table_name: tbl.id  for tbl in (
+            db.session
+            .query(models.SqlaTable)
+            .all()
+        )}
         utils.init(caravel)
         self.load_examples()
 
@@ -46,15 +64,27 @@ def setUp(self):
     def tearDown(self):
         pass
 
-    def login(self):
-        self.client.post(
-            '/login/',
-            data=dict(username='admin', password='general'),
-            follow_redirects=True)
-
     def load_examples(self):
         cli.load_examples(sample=True)
 
+    def test_save_slice(self):
+        self.login()
+
+        slice_id = db.session.query(models.Slice.id).filter_by(slice_name="Energy Sankey").scalar()
+        copy_name = "Test Sankey Save"
+        tbl_id = self.table_ids.get('energy_usage')
+        url = "/caravel/explore/table/{}/?viz_type=sankey&groupby=source&groupby=target&metric=sum__value&row_limit=5000&where=&having=&flt_col_0=source&flt_op_0=in&flt_eq_0=&slice_id={}&slice_name={}&collapsed_fieldsets=&action={}&datasource_name=energy_usage&datasource_id=1&datasource_type=table&previous_viz_type=sankey"
+
+        db.session.commit()
+        resp = self.client.get(
+            url.format(tbl_id, slice_id, copy_name, 'save'),
+            follow_redirects=True)
+        assert copy_name in resp.data.decode('utf-8')
+        resp = self.client.get(
+            url.format(tbl_id, slice_id, copy_name, 'overwrite'),
+            follow_redirects=True)
+        assert 'Energy' in resp.data.decode('utf-8')
+
     def test_slices(self):
         # Testing by running all the examples
         self.login()
@@ -68,21 +98,12 @@ def test_slices(self):
         for url in urls:
             self.client.get(url)
 
-    def test_csv(self):
-        self.client.get('/caravel/explore/table/1/?viz_type=table&granularity=ds&since=100+years&until=now&metrics=count&groupby=name&limit=50&show_brush=y&show_brush=false&show_legend=y&show_brush=false&rich_tooltip=y&show_brush=false&show_brush=false&show_brush=false&show_brush=false&y_axis_format=&x_axis_showminmax=y&show_brush=false&line_interpolation=linear&rolling_type=None&rolling_periods=&time_compare=&num_period_compare=&where=&having=&flt_col_0=gender&flt_op_0=in&flt_eq_0=&flt_col_0=gender&flt_op_0=in&flt_eq_0=&slice_id=14&slice_name=Boys&collapsed_fieldsets=&action=&datasource_name=birth_names&datasource_id=1&datasource_type=table&previous_viz_type=line&csv=true')
-
-    def test_bubble_chart_no_time(self):
-        self.login()
-        response = self.client.get('/caravel/explore/table/1/?viz_type=bubble&series=source&entity=source&x=count&y=count&size=count&limit=50&x_log_scale=false&y_log_scale=false&show_legend=y&show_legend=false&max_bubble_size=25&where=&having=&flt_col_0=source&flt_op_0=in&flt_eq_0=&slice_id=&slice_name=&collapsed_fieldsets=&action=&datasource_name=energy_usage&datasource_id=1&datasource_type=table&previous_viz_type=bubble&json=true&force=false')
-        self.assertEqual(response.status_code, 200)
-
     def test_dashboard(self):
         self.login()
         urls = {}
         for dash in db.session.query(models.Dashboard).all():
             urls[dash.dashboard_title] = dash.url
         for title, url in urls.items():
-            print(url)
             assert escape(title) in self.client.get(url).data.decode('utf-8')
 
     def test_doctests(self):
@@ -96,6 +117,21 @@ def test_misc(self):
         assert self.client.get('/health').data.decode('utf-8') == "OK"
         assert self.client.get('/ping').data.decode('utf-8') == "OK"
 
+    def test_shortner(self):
+        self.login()
+        data = "//caravel/explore/table/1/?viz_type=sankey&groupby=source&groupby=target&metric=sum__value&row_limit=5000&where=&having=&flt_col_0=source&flt_op_0=in&flt_eq_0=&slice_id=78&slice_name=Energy+Sankey&collapsed_fieldsets=&action=&datasource_name=energy_usage&datasource_id=1&datasource_type=table&previous_viz_type=sankey"
+        resp = self.client.post('/r/shortner/', data=data)
+        assert '/r/' in resp.data.decode('utf-8')
+
+    def test_save_dash(self):
+        self.login()
+        dash = db.session.query(models.Dashboard).filter_by(slug="births").first()
+        data = """{"positions":[{"slice_id":"131","col":8,"row":8,"size_x":2,"size_y":4},{"slice_id":"132","col":10,"row":8,"size_x":2,"size_y":4},{"slice_id":"133","col":1,"row":1,"size_x":2,"size_y":2},{"slice_id":"134","col":3,"row":1,"size_x":2,"size_y":2},{"slice_id":"135","col":5,"row":4,"size_x":3,"size_y":3},{"slice_id":"136","col":1,"row":7,"size_x":7,"size_y":4},{"slice_id":"137","col":9,"row":1,"size_x":3,"size_y":3},{"slice_id":"138","col":5,"row":1,"size_x":4,"size_y":3},{"slice_id":"139","col":1,"row":3,"size_x":4,"size_y":4},{"slice_id":"140","col":8,"row":4,"size_x":4,"size_y":4}],"css":"None","expanded_slices":{}}"""
+        url = '/caravel/save_dash/{}/'.format(dash.id)
+        resp = self.client.post(url, data=dict(data=data))
+        assert "SUCCESS" in resp.data.decode('utf-8')
+
+
 
 SEGMENT_METADATA = [{
   "id" : "some_id",
@@ -125,13 +161,15 @@ def test_misc(self):
 }]
 
 
-class DruidTests(unittest.TestCase):
+class DruidTests(CaravelTestCase):
 
     """Testing interactions with Druid"""
 
+    def __init__(self, *args, **kwargs):
+        super(DruidTests, self).__init__(*args, **kwargs)
+
     @patch('caravel.models.PyDruid')
     def test_client(self, PyDruid):
-        from caravel.models import DruidCluster
         instance = PyDruid.return_value
         instance.time_boundary.return_value = [
             {'result': {'maxTime': '2016-01-01'}}]
@@ -154,6 +192,7 @@ def test_client(self, PyDruid):
             broker_host='localhost',
             broker_port=7980,
             metadata_last_refreshed=datetime.now())
+
         db.session.add(cluster)
         cluster.get_datasources = Mock(return_value=['test_datasource'])
         cluster.refresh_datasources()