@@ -66,70 +66,20 @@ async function initializePDFJS(callback) {
6666 extend ( window , jasmineInterface ) ;
6767
6868 // Runner Parameters
69- const queryString = new jasmine . QueryString ( {
70- getWindowLocation ( ) {
71- return window . location ;
72- } ,
73- } ) ;
74-
75- const config = {
76- failFast : queryString . getParam ( "failFast" ) ,
77- oneFailurePerSpec : queryString . getParam ( "oneFailurePerSpec" ) ,
78- hideDisabled : queryString . getParam ( "hideDisabled" ) ,
79- } ;
80-
81- const random = queryString . getParam ( "random" ) ;
82- if ( random !== undefined && random !== "" ) {
83- config . random = random ;
84- }
69+ const urls = new jasmine . HtmlReporterV2Urls ( ) ;
8570
86- const seed = queryString . getParam ( "seed" ) ;
87- if ( seed ) {
88- config . seed = seed ;
89- }
71+ env . configure ( urls . configFromCurrentUrl ( ) ) ;
9072
9173 // Reporters
92- const htmlReporter = new jasmine . HtmlReporter ( {
93- env,
94- navigateWithNewParam ( key , value ) {
95- return queryString . navigateWithNewParam ( key , value ) ;
96- } ,
97- addToExistingQueryString ( key , value ) {
98- return queryString . fullStringWithNewParam ( key , value ) ;
99- } ,
100- getContainer ( ) {
101- return document . body ;
102- } ,
103- createElement ( ) {
104- return document . createElement ( ...arguments ) ;
105- } ,
106- createTextNode ( ) {
107- return document . createTextNode ( ...arguments ) ;
108- } ,
109- timer : new jasmine . Timer ( ) ,
110- } ) ;
74+ const htmlReporter = new jasmine . HtmlReporterV2 ( { env, urls } ) ;
11175
11276 env . addReporter ( htmlReporter ) ;
11377
114- if ( queryString . getParam ( "browser" ) ) {
115- const testReporter = new TestReporter ( queryString . getParam ( "browser" ) ) ;
78+ if ( urls . queryString . getParam ( "browser" ) ) {
79+ const testReporter = new TestReporter ( urls . queryString . getParam ( "browser" ) ) ;
11680 env . addReporter ( testReporter ) ;
11781 }
11882
119- // Filter which specs will be run by matching the start of the full name
120- // against the `spec` query param.
121- const specFilter = new jasmine . HtmlSpecFilter ( {
122- filterString ( ) {
123- return queryString . getParam ( "spec" ) ;
124- } ,
125- } ) ;
126-
127- config . specFilter = function ( spec ) {
128- return specFilter . matches ( spec . getFullName ( ) ) ;
129- } ;
130-
131- env . configure ( config ) ;
132-
13383 // Sets longer timeout.
13484 jasmine . DEFAULT_TIMEOUT_INTERVAL = 30000 ;
13585
@@ -142,7 +92,6 @@ async function initializePDFJS(callback) {
14292
14393 function fontTestInit ( ) {
14494 initializePDFJS ( function ( ) {
145- htmlReporter . initialize ( ) ;
14695 env . execute ( ) ;
14796 } ) ;
14897 }
0 commit comments