[rb] restore default Firefox Profile settings to match 3.x

Author: titusfortner

rb/lib/selenium/webdriver/firefox/profile.rb

@@ -25,6 +25,14 @@ class Profile
 
         VALID_PREFERENCE_TYPES = [TrueClass, FalseClass, Integer, Float, String].freeze
 
+        DEFAULT_PREFERENCES = {
+          "browser.newtabpage.enabled" => false,
+          "browser.startup.homepage" => "about:blank",
+          "browser.usedOnWindows10.introURL" => "about:blank",
+          "network.captive-portal-service.enabled" => false,
+          "security.csp.enable" => false
+        }.freeze
+
         attr_reader   :name, :log_file
         attr_writer   :secure_ssl, :load_no_focus_lib
 
@@ -179,10 +187,12 @@ def extension_name_for(path)
 
         def update_user_prefs_in(directory)
           path = File.join(directory, 'user.js')
-          prefs = read_user_prefs(path).merge(@additional_prefs)
+          prefs = read_user_prefs(path)
+          prefs.merge! self.class::DEFAULT_PREFERENCES
+          prefs.merge!(@additional_prefs)
 
           # If the user sets the home page, we should also start up there
-          prefs['startup.homepage_welcome_url'] = prefs['browser.startup.homepage']
+          prefs['startup.homepage_welcome_url'] ||= prefs['browser.startup.homepage']
 
           write_prefs prefs, path
         end

rb/spec/unit/selenium/webdriver/firefox/profile_spec.rb

@@ -32,6 +32,24 @@ def read_generated_prefs(from = nil)
           File.read(File.join(dir, 'user.js'))
         end
 
+        it 'uses default preferences' do
+          prefs = read_generated_prefs
+          expect(prefs).to include('user_pref("browser.newtabpage.enabled", false)')
+          expect(prefs).to include('user_pref("browser.startup.homepage", "about:blank")')
+          expect(prefs).to include('user_pref("startup.homepage_welcome_url", "about:blank")')
+          expect(prefs).to include('user_pref("browser.usedOnWindows10.introURL", "about:blank")')
+          expect(prefs).to include('user_pref("network.captive-portal-service.enabled", false)')
+          expect(prefs).to include('user_pref("security.csp.enable", false)')
+        end
+
+        it 'can override welcome page' do
+          profile['startup.homepage_welcome_url'] = "http://google.com"
+
+          prefs = read_generated_prefs
+          expect(prefs).to include('user_pref("browser.startup.homepage", "about:blank")')
+          expect(prefs).to include('user_pref("startup.homepage_welcome_url", "http://google.com")')
+        end
+
         it 'should set additional preferences' do
           profile['foo.number'] = 123
           profile['foo.boolean'] = true