@@ -334,15 +334,18 @@ acceptance("Data Explorer Plugin | Param Input", function (needs) {
334
334
} ) ;
335
335
} ) ;
336
336
337
+ function getSearchParam ( param ) {
338
+ const searchParams = new URLSearchParams ( currentURL ( ) . split ( "?" ) [ 1 ] ) ;
339
+ return JSON . parse ( searchParams . get ( "params" ) ) [ param ] ;
340
+ }
341
+
337
342
test ( "puts params for the query into the url" , async function ( assert ) {
338
343
await visit ( "/admin/plugins/explorer/queries/-6" ) ;
339
344
const monthsAgoValue = "2" ;
340
345
await fillIn ( ".query-params input" , monthsAgoValue ) ;
341
346
await click ( "form.query-run button" ) ;
342
347
343
- const searchParams = new URLSearchParams ( currentURL ( ) . split ( "?" ) [ 1 ] ) ;
344
- const monthsAgoParam = JSON . parse ( searchParams . get ( "params" ) ) . months_ago ;
345
- assert . strictEqual ( monthsAgoParam , monthsAgoValue ) ;
348
+ assert . strictEqual ( getSearchParam ( "months_ago" ) , monthsAgoValue ) ;
346
349
} ) ;
347
350
348
351
test ( "puts params for the query into the url for group reports" , async function ( assert ) {
@@ -351,9 +354,7 @@ acceptance("Data Explorer Plugin | Param Input", function (needs) {
351
354
await fillIn ( ".query-params input" , monthsAgoValue ) ;
352
355
await click ( "form.query-run button" ) ;
353
356
354
- const searchParams = new URLSearchParams ( currentURL ( ) . split ( "?" ) [ 1 ] ) ;
355
- const monthsAgoParam = JSON . parse ( searchParams . get ( "params" ) ) . months_ago ;
356
- assert . strictEqual ( monthsAgoParam , monthsAgoValue ) ;
357
+ assert . strictEqual ( getSearchParam ( "months_ago" ) , monthsAgoValue ) ;
357
358
} ) ;
358
359
359
360
test ( "loads the page if one of the parameter is null" , async function ( assert ) {
@@ -396,14 +397,14 @@ acceptance("Data Explorer Plugin | Param Input", function (needs) {
396
397
await visit ( "/admin/plugins/explorer/queries/4" ) ;
397
398
assert . strictEqual ( catChooser . header ( ) . value ( ) , null ) ;
398
399
400
+ await click ( "form.query-run button" ) ;
401
+ assert . strictEqual ( getSearchParam ( "category" ) , "" ) ;
402
+
399
403
await catChooser . expand ( ) ;
400
404
await catChooser . selectRowByIndex ( 0 ) ;
401
405
assert . strictEqual ( catChooser . header ( ) . label ( ) , selectedCategory . name ) ;
402
406
403
407
await click ( "form.query-run button" ) ;
404
-
405
- const searchParams = new URLSearchParams ( currentURL ( ) . split ( "?" ) [ 1 ] ) ;
406
- const categoryIdParam = JSON . parse ( searchParams . get ( "params" ) ) . category ;
407
- assert . strictEqual ( categoryIdParam , selectedCategory . id ) ;
408
+ assert . strictEqual ( getSearchParam ( "category" ) , selectedCategory . id ) ;
408
409
} ) ;
409
410
} ) ;
0 commit comments