Procházet zdrojové kódy

Fix #469: Let the users deal with whatever default prefs, not my problem

George S. Baugh před 4 roky
rodič
revize
352676c597

+ 4 - 1
at/firefox.test

@@ -2,7 +2,7 @@ use strict;
 use warnings;
 
 use Selenium::Firefox;
-use Test::More tests => 3;
+use Test::More tests => 4;
 use Test::Fatal;
 
 my $driver;
@@ -16,6 +16,9 @@ is( exception { $driver = Selenium::Firefox->new(
 
 my $port = $driver->port();
 
+ok($driver->get('http://google.com'),"can load a page");
+$driver->quit();
+
 is( exception { $driver->shutdown_binary; }, undef, "can shutdown binary correctly");
 sleep 2;
 

+ 1 - 27
lib/Selenium/Firefox/Profile.pm

@@ -205,18 +205,15 @@ for a new geckodriver session.
 sub add_webdriver {
     my ( $self, $port, $is_marionette ) = @_;
 
-    my $prefs              = $self->_load_prefs;
+    my $prefs              = {};
     my $current_user_prefs = $self->{user_prefs};
 
     $self->set_preference(
-        %{ $prefs->{mutable} },
-
         # having the user prefs here allows them to overwrite the
         # mutable loaded prefs
         %{$current_user_prefs},
 
         # but the frozen ones cannot be overwritten
-        %{ $prefs->{frozen} },
         'webdriver_firefox_port' => $port
     );
 
@@ -227,29 +224,6 @@ sub add_webdriver {
     return $self;
 }
 
-sub _load_prefs {
-
-    # The appropriate webdriver preferences are stored in an adjacent
-    # JSON file; it's useful things like disabling default browser
-    # checks and setting an empty single page as the start up tab
-    # configuration. Unfortunately, these change with each version of
-    # webdriver.
-
-    my $this_dir               = dirname( abs_path(__FILE__) );
-    my $default_prefs_filename = $this_dir . '/webdriver_prefs.json';
-
-    my $json;
-    {
-        local $/;
-        open( my $fh, '<', $default_prefs_filename );
-        $json = <$fh>;
-        close($fh);
-    }
-
-    my $prefs = decode_json($json);
-
-    return $prefs;
-}
 
 =head2 add_webdriver_xpi
 

+ 0 - 69
lib/Selenium/Firefox/webdriver_prefs.json

@@ -1,69 +0,0 @@
-{
-  "frozen": {
-    "app.update.auto": false,
-    "app.update.enabled": false,
-    "browser.displayedE10SNotice": 4,
-    "browser.download.manager.showWhenStarting": false,
-    "browser.EULA.override": true,
-    "browser.EULA.3.accepted": true,
-    "browser.link.open_external": 2,
-    "browser.link.open_newwindow": 2,
-    "browser.offline": false,
-    "browser.reader.detectedFirstArticle": true,
-    "browser.safebrowsing.enabled": false,
-    "browser.safebrowsing.malware.enabled": false,
-    "browser.search.update": false,
-    "browser.selfsupport.url" : "",
-    "browser.sessionstore.resume_from_crash": false,
-    "browser.shell.checkDefaultBrowser": false,
-    "browser.tabs.warnOnClose": false,
-    "browser.tabs.warnOnOpen": false,
-    "datareporting.healthreport.service.enabled": false,
-    "datareporting.healthreport.uploadEnabled": false,
-    "datareporting.healthreport.service.firstRun": false,
-    "datareporting.healthreport.logging.consoleEnabled": false,
-    "datareporting.policy.dataSubmissionEnabled": false,
-    "datareporting.policy.dataSubmissionPolicyAccepted": false,
-    "devtools.errorconsole.enabled": true,
-    "dom.disable_open_during_load": false,
-    "extensions.autoDisableScopes": 10,
-    "extensions.blocklist.enabled": false,
-    "extensions.checkCompatibility.nightly": false,
-    "extensions.logging.enabled": true,
-    "extensions.update.enabled": false,
-    "extensions.update.notifyUser": false,
-    "javascript.enabled": true,
-    "network.manage-offline-status": false,
-    "network.http.phishy-userpass-length": 255,
-    "offline-apps.allow_by_default": true,
-    "prompts.tab_modal.enabled": false,
-    "security.csp.enable": false,
-    "security.fileuri.origin_policy": 3,
-    "security.fileuri.strict_origin_policy": false,
-    "signon.rememberSignons": false,
-    "toolkit.networkmanager.disable": true,
-    "toolkit.telemetry.prompted": 2,
-    "toolkit.telemetry.enabled": false,
-    "toolkit.telemetry.rejected": true,
-    "xpinstall.signatures.required": false,
-    "xpinstall.whitelist.required": false
-  },
-  "mutable": {
-    "browser.dom.window.dump.enabled": true,
-    "browser.laterrun.enabled": false,
-    "browser.newtab.url": "about:blank",
-    "browser.newtabpage.enabled": false,
-    "browser.startup.page": 0,
-    "browser.startup.homepage": "about:blank",
-    "browser.startup.homepage_override.mstone": "ignore",
-    "browser.usedOnWindows10.introURL": "about:blank",
-    "dom.max_chrome_script_run_time": 30,
-    "dom.max_script_run_time": 30,
-    "dom.report_all_js_exceptions": true,
-    "javascript.options.showInConsole": true,
-    "startup.homepage_welcome_url": "about:blank",
-    "startup.homepage_welcome_url.additional": "about:blank",
-    "webdriver_accept_untrusted_certs": true,
-    "webdriver_assume_untrusted_issuer": true
-  }
-}