From d1867f310c8da2f9a219d85d6ac03a3dbdbbfcac Mon Sep 17 00:00:00 2001
From: Valentin Deniaud <vdeniaud@entrouvert.com>
Date: Wed, 18 Dec 2019 12:09:09 +0100
Subject: [PATCH 1/2] tests: move visualization creation to fixture (#30854)

---
 tests/test_views.py | 55 +++++++++++++++++----------------------------
 1 file changed, 21 insertions(+), 34 deletions(-)

diff --git a/tests/test_views.py b/tests/test_views.py
index 1b18460..f3e1c72 100644
--- a/tests/test_views.py
+++ b/tests/test_views.py
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import pytest
+
 from django.core.urlresolvers import reverse
 
 from bijoe.visualization.models import Visualization
@@ -21,6 +23,20 @@ from bijoe.visualization.models import Visualization
 from utils import login
 
 
+@pytest.fixture
+def visualization():
+    return Visualization.objects.create(
+        name='test',
+        parameters={
+            'cube': 'facts1',
+            'warehouse': 'schema1',
+            'measure': 'simple_count',
+            'representation': 'table',
+            'loop': '',
+            'filters': {},
+            'drilldown_x': 'date__yearmonth'})
+
+
 def test_simple_user_403(app, john_doe):
     login(app, john_doe)
     app.get('/', status=403)
@@ -45,19 +61,7 @@ def test_visualizations_json_api(schema1, app, admin):
     assert set([x['slug'] for x in resp.json]) == set(['test', 'test-2', 'test-3'])
 
 
-def test_visualization_json_api(schema1, app, admin):
-    visualization = Visualization(
-            name='test',
-            parameters={
-                'cube': 'facts1',
-                'warehouse': 'schema1',
-                'measure': 'simple_count',
-                'representation': 'table',
-                'loop': '',
-                'filters': {},
-                'drilldown_x': 'date__yearmonth'})
-    visualization.save()
-
+def test_visualization_json_api(schema1, app, admin, visualization):
     login(app, admin)
     resp = app.get(reverse('visualization-json', kwargs={'pk': visualization.id}))
     # values from test_schem1/test_yearmonth_drilldown
@@ -70,17 +74,8 @@ def test_visualization_json_api(schema1, app, admin):
     }
 
 
-def test_visualization_json_api_duration(schema1, app, admin):
-    visualization = Visualization(
-        name='test',
-        parameters={
-            'cube': 'facts1',
-            'warehouse': 'schema1',
-            'measure': 'duration',
-            'representation': 'table',
-            'loop': '',
-            'filters': {},
-            'drilldown_x': 'date__yearmonth'})
+def test_visualization_json_api_duration(schema1, app, admin, visualization):
+    visualization.parameters['measure'] = 'duration'
     visualization.save()
 
     login(app, admin)
@@ -95,16 +90,8 @@ def test_visualization_json_api_duration(schema1, app, admin):
     }
 
 
-def test_missing_data(schema1, app, admin):
-    visualization = Visualization(
-        name='test',
-        parameters={
-            'cube': 'missing_cube',
-            'warehouse': 'schema1',
-            'measure': 'duration',
-            'representation': 'table',
-            'loop': '',
-            'filters': {}})
+def test_missing_data(schema1, app, admin, visualization):
+    visualization.parameters['cube'] = 'missing_cube'
     visualization.save()
     login(app, admin)
 
-- 
2.20.1