Merge pull request #16 from andreasgerstmayr/tests

update tests
andreasgerstmayr · Sep 10, 2023 · 7eb6635 · 7eb6635
2 parents f754291 + c645f7e
commit 7eb6635
Show file tree

Hide file tree

Showing 8 changed files with 5,398 additions and 8,750 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -14,24 +14,22 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Replace canvas renderer with SVG renderer
+      - name: Install dependencies
         run: |
-          sed -i 's/echarts.init(elem)/echarts.init(elem, null, { renderer: "svg" })/' frontend/src/extension.ts
+          sudo pip3 install black
+          sudo npm install -g prettier
 
-      - name: Install test dependencies
-        run: cd frontend; npm ci
-
-      - name: Build
-        run: cd frontend; npm run build
+      - name: Build frontend
+        run: make build
 
       - name: Install fava-dashboards
         run: pip3 install .
 
       - name: Start Fava
         run: cd example; fava example.beancount &
 
-      - name: Run tests
-        run: cd frontend; npm run test -- -t SVG
+      - name: Run HTML tests
+        run: cd frontend; npm run test -- -t HTML
 
       - name: Run formatter
         run: |

diff --git a/fava_dashboards/FavaDashboards.js b/fava_dashboards/FavaDashboards.js
diff --git a/fava_dashboards/templates/FavaDashboards.html b/fava_dashboards/templates/FavaDashboards.html
@@ -3,7 +3,7 @@
 {% set dashboard_id = request.args.get('dashboard', '0') | int %}
 {% set bootstrap = extension.bootstrap(dashboard_id) %}
 <script id="favaDashboardsBootstrap" type="application/json">
-{{ bootstrap|tojson }}
+{{ {"ledger": bootstrap["ledger"], "dashboard": bootstrap["dashboards"][dashboard_id]}|tojson }}
 </script>
 
 <div class="headerline">

diff --git a/frontend/src/extension.ts b/frontend/src/extension.ts
@@ -77,9 +77,6 @@ export default {
         if (!boostrapJSON) return;
 
         const bootstrap = JSON.parse(boostrapJSON);
-        const ledger = bootstrap.ledger;
-        const dashboard = bootstrap.dashboards[bootstrap.dashboardId];
-
-        renderDashboard(ledger, dashboard);
+        renderDashboard(bootstrap.ledger, bootstrap.dashboard);
     },
 };
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
@@ -16,6 +16,5 @@ export interface Dashboard {
 
 export interface Bootstrap {
     ledger: Ledger;
-    dashboards: Dashboard[];
-    dashboardId: number;
+    dashboard: Dashboard;
 }
diff --git a/frontend/tests/e2e/__image_snapshots__/dashboard_income_and_expenses.png b/frontend/tests/e2e/__image_snapshots__/dashboard_income_and_expenses.png