@@ -13,27 +13,26 @@ const { createFactory } = require("devtools/client/shared/vendor/react");
1313const ConsoleApiCall = createFactory ( require ( "devtools/client/webconsole/new-console-output/components/message-types/console-api-call" ) . ConsoleApiCall ) ;
1414
1515// Test fakes.
16- const { stubPreparedMessages } = require ( "devtools/client/webconsole/new-console-output/test/fixtures/stubs/index" ) ;
17- const onViewSourceInDebugger = ( ) => { } ;
18-
16+ const { stubPreparedMessages : stubs } = require ( "devtools/client/webconsole/new-console-output/test/fixtures/stubs/index" ) ;
17+ const props = {
18+ onViewSourceInDebugger : ( ) => { } ,
19+ } ;
1920const tempfilePath = "http://example.com/browser/devtools/client/webconsole/new-console-output/test/fixtures/stub-generators/test-tempfile.js" ;
2021
2122describe ( "ConsoleAPICall component:" , ( ) => {
2223 describe ( "console.log" , ( ) => {
2324 it ( "renders string grips" , ( ) => {
24- const message = stubPreparedMessages . get ( "console.log('foobar', 'test')" ) ;
25- const wrapper = render ( ConsoleApiCall ( { message , onViewSourceInDebugger } ) ) ;
25+ const message = stubs . get ( "console.log('foobar', 'test')" ) ;
26+ const wrapper = render ( ConsoleApiCall ( Object . assign ( { } , props , { message } ) ) ) ;
2627
2728 expect ( wrapper . find ( ".message-body" ) . text ( ) ) . toBe ( "foobar test" ) ;
2829 expect ( wrapper . find ( ".objectBox-string" ) . length ) . toBe ( 2 ) ;
2930 expect ( wrapper . find ( "div.message.cm-s-mozilla span span.message-flex-body span.message-body.devtools-monospace" ) . length ) . toBe ( 1 ) ;
3031 } ) ;
3132
3233 it ( "renders repeat node" , ( ) => {
33- const message =
34- stubPreparedMessages . get ( "console.log('foobar', 'test')" )
35- . set ( "repeat" , 107 ) ;
36- const wrapper = render ( ConsoleApiCall ( { message, onViewSourceInDebugger } ) ) ;
34+ const message = stubs . get ( "console.log('foobar', 'test')" ) . set ( "repeat" , 107 ) ;
35+ const wrapper = render ( ConsoleApiCall ( Object . assign ( { } , props , { message } ) ) ) ;
3736
3837 expect ( wrapper . find ( ".message-repeats" ) . text ( ) ) . toBe ( "107" ) ;
3938
@@ -43,35 +42,35 @@ describe("ConsoleAPICall component:", () => {
4342
4443 describe ( "console.count" , ( ) => {
4544 it ( "renders" , ( ) => {
46- const message = stubPreparedMessages . get ( "console.count('bar')" ) ;
47- const wrapper = render ( ConsoleApiCall ( { message , onViewSourceInDebugger } ) ) ;
45+ const message = stubs . get ( "console.count('bar')" ) ;
46+ const wrapper = render ( ConsoleApiCall ( Object . assign ( { } , props , { message } ) ) ) ;
4847
4948 expect ( wrapper . find ( ".message-body" ) . text ( ) ) . toBe ( "bar: 1" ) ;
5049 } ) ;
5150 } ) ;
5251
5352 describe ( "console.assert" , ( ) => {
5453 it ( "renders" , ( ) => {
55- const message = stubPreparedMessages . get ( "console.assert(false, {message: 'foobar'})" ) ;
56- const wrapper = render ( ConsoleApiCall ( { message , onViewSourceInDebugger } ) ) ;
54+ const message = stubs . get ( "console.assert(false, {message: 'foobar'})" ) ;
55+ const wrapper = render ( ConsoleApiCall ( Object . assign ( { } , props , { message } ) ) ) ;
5756
5857 expect ( wrapper . find ( ".message-body" ) . text ( ) ) . toBe ( "Assertion failed: Object { message: \"foobar\" }" ) ;
5958 } ) ;
6059 } ) ;
6160
6261 describe ( "console.time" , ( ) => {
6362 it ( "does not show anything" , ( ) => {
64- const message = stubPreparedMessages . get ( "console.time('bar')" ) ;
65- const wrapper = render ( ConsoleApiCall ( { message , onViewSourceInDebugger } ) ) ;
63+ const message = stubs . get ( "console.time('bar')" ) ;
64+ const wrapper = render ( ConsoleApiCall ( Object . assign ( { } , props , { message } ) ) ) ;
6665
6766 expect ( wrapper . find ( ".message-body" ) . text ( ) ) . toBe ( "" ) ;
6867 } ) ;
6968 } ) ;
7069
7170 describe ( "console.timeEnd" , ( ) => {
7271 it ( "renders as expected" , ( ) => {
73- const message = stubPreparedMessages . get ( "console.timeEnd('bar')" ) ;
74- const wrapper = render ( ConsoleApiCall ( { message , onViewSourceInDebugger } ) ) ;
72+ const message = stubs . get ( "console.timeEnd('bar')" ) ;
73+ const wrapper = render ( ConsoleApiCall ( Object . assign ( { } , props , { message } ) ) ) ;
7574
7675 expect ( wrapper . find ( ".message-body" ) . text ( ) ) . toBe ( message . messageText ) ;
7776 expect ( wrapper . find ( ".message-body" ) . text ( ) ) . toMatch ( / ^ b a r : \d + ( \. \d + ) ? m s $ / ) ;
@@ -80,9 +79,9 @@ describe("ConsoleAPICall component:", () => {
8079
8180 describe ( "console.trace" , ( ) => {
8281 it ( "renders" , ( ) => {
83- const message = stubPreparedMessages . get ( "console.trace()" ) ;
84- const wrapper = render ( ConsoleApiCall ( { message , onViewSourceInDebugger , open : true } ) ) ;
85- const filepath = `${ tempfilePath } ` ;
82+ const message = stubs . get ( "console.trace()" ) ;
83+ const wrapper = render ( ConsoleApiCall ( Object . assign ( { } , props , { message , open : true } ) ) ) ;
84+ const filepath = `${ tempfilePath } ?key=console.trace() ` ;
8685
8786 expect ( wrapper . find ( ".message-body" ) . text ( ) ) . toBe ( "console.trace()" ) ;
8887
0 commit comments