From a60ec00f7aed1cace6cb0b8d66cf1e27b1092fc1 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Wed, 3 Jul 2019 16:32:27 +0200 Subject: [PATCH] fix tests (#7853) --- test/javascripts/acceptance/reports-test.js.es6 | 2 +- test/javascripts/fixtures/reports_bulk.js.es6 | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/test/javascripts/acceptance/reports-test.js.es6 b/test/javascripts/acceptance/reports-test.js.es6 index 6f0b69873f8..3164a9a85ae 100644 --- a/test/javascripts/acceptance/reports-test.js.es6 +++ b/test/javascripts/acceptance/reports-test.js.es6 @@ -29,7 +29,7 @@ QUnit.test("Visit reports page", async assert => { }); QUnit.test("Visit report page", async assert => { - await visit("/admin/reports/page_view_total_reqs"); + await visit("/admin/reports/staff_logins"); assert.ok(exists(".export-csv-btn")); }); diff --git a/test/javascripts/fixtures/reports_bulk.js.es6 b/test/javascripts/fixtures/reports_bulk.js.es6 index ba2c230b8d9..f993978f8d8 100644 --- a/test/javascripts/fixtures/reports_bulk.js.es6 +++ b/test/javascripts/fixtures/reports_bulk.js.es6 @@ -59,8 +59,7 @@ let signups = { prev_end_date: "2018-06-17T00:00:00Z", prev30Days: null, dates_filtering: true, - report_key: - 'reports:signups:20180616:20180716:[:prev_period]:50:{"group":"88"}:4', + report_key: 'reports:signups:start:end:[:prev_period]:50:{"group":"88"}:4', available_filters: [ { id: "group", allow_any: false, choices: [], default: "88" } ], @@ -159,7 +158,7 @@ const page_view_total_reqs = { prev_end_date: "2018-07-23T00:00:00Z", prev30Days: 58110, dates_filtering: true, - report_key: `reports:page_view_total_reqs:start:end:[:prev_period]:50:${SCHEMA_VERSION}`, + report_key: `reports:page_view_total_reqs:start:end:[:prev_period]:${SCHEMA_VERSION}`, labels: [ { type: "date", property: "x", title: "Day" }, { type: "number", property: "y", title: "Count" } @@ -172,6 +171,11 @@ const page_view_total_reqs = { total: 921672 }; +const staff_logins = JSON.parse(JSON.stringify(page_view_total_reqs)); +staff_logins.type = "staff_logins"; +staff_logins.modes = ["table"]; +staff_logins.report_key = `reports:staff_logins:start:end:[:prev_period]:50:${SCHEMA_VERSION}`; + export default { "/admin/reports/bulk": { reports: [ @@ -179,7 +183,8 @@ export default { signups_not_found, signups_exception, signups_timeout, - page_view_total_reqs + page_view_total_reqs, + staff_logins ] } };