File tree Expand file tree Collapse file tree 2 files changed +20
-3
lines changed Expand file tree Collapse file tree 2 files changed +20
-3
lines changed Original file line number Diff line number Diff line change @@ -106,7 +106,7 @@ const _getChromePreferencesWithDefaults = (userDir: string): Bluebird<ChromePref
106106 return _getChromePreferences ( userDir )
107107 . then ( ( existingPrefs ) => {
108108 // Merge default preferences with existing preferences
109- const defaultPrefs = _getDefaultChromePreferences ( )
109+ const defaultPrefs = module . exports . _getDefaultChromePreferences ( )
110110
111111 return _mergeChromePreferences ( defaultPrefs , existingPrefs )
112112 } )
@@ -600,7 +600,7 @@ export = {
600600
601601 // Merge preferences BEFORE writing them to disk
602602 // Start with defaults merged with raw preferences
603- let finalPreferences = _mergeChromePreferences ( _getDefaultChromePreferences ( ) , rawPreferences )
603+ let finalPreferences = _mergeChromePreferences ( module . exports . _getDefaultChromePreferences ( ) , rawPreferences )
604604
605605 if ( launchOptions . preferences ) {
606606 finalPreferences = _mergeChromePreferences ( finalPreferences , launchOptions . preferences as ChromePreferences )
Original file line number Diff line number Diff line change @@ -1050,7 +1050,24 @@ describe('lib/browsers/chrome', () => {
10501050
10511051 return chrome . _getChromePreferencesWithDefaults ( '/foo' )
10521052 . then ( ( result ) => {
1053- expect ( result ) . to . deep . eq ( mockDefaults )
1053+ // Should merge defaults with existing preferences, where existing values take precedence
1054+ expect ( result ) . to . deep . eq ( {
1055+ default : {
1056+ fake_preference : {
1057+ value : 'value' ,
1058+ } ,
1059+ existing : 'value' , // existing preference should be merged in
1060+ } ,
1061+ defaultSecure : {
1062+ secure : 'value' , // existing preference should be merged in
1063+ } ,
1064+ localState : {
1065+ fake_local_state : {
1066+ value : 'value' ,
1067+ } ,
1068+ local : 'value' , // existing preference should be merged in
1069+ } ,
1070+ } )
10541071 } )
10551072 . finally ( ( ) => {
10561073 mockDefaultPrefs . restore ( )
You can’t perform that action at this time.
0 commit comments