From 19ad7c06f3d232bc96ae3d9f96c43910f4538138 Mon Sep 17 00:00:00 2001 From: ray Date: Fri, 12 Jun 2020 19:27:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8B=E8=BD=BD=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seleniumkeyword/Base.py | 10 +++++----- seleniumkeyword/data/readme.md | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 seleniumkeyword/data/readme.md diff --git a/seleniumkeyword/Base.py b/seleniumkeyword/Base.py index 8d680ce..34bbb3d 100644 --- a/seleniumkeyword/Base.py +++ b/seleniumkeyword/Base.py @@ -236,18 +236,18 @@ def action_openBrowser(action_object, step_desc, value, loc): option.add_argument('-headless') # 不打开图形界面 action_object.driver = webdriver.Chrome(chrome_options=option) elif browser.upper() == 'FIREFOX': - fp = webdriver.FirefoxProfile() + fp = webdriver.FirefoxProfile(profile_directory=downloaddir) fp.set_preference('browser.download.manager.showWhenStarting', False) # fp.set_preference('browser.download.folderList', 2) # 设置Firefox的默认下载文件夹。0是桌面；1是“我的下载”；2是自定义。 fp.set_preference('browser.download.dir', downloaddir) # 设置自定义路径时，定义的路径 - fp.set_preference('browser.helperApps.neverAsk.saveToDisk', 'binary/octet-stream') # application/zip 不询问下载路径；后面的参数为要下载页面的文件类型的值。 - action_object.driver = webdriver.Firefox(firefox_profile=fp) + fp.set_preference('browser.helperApps.neverAsk.saveToDisk', 'application/octet-stream') # application/zip 不询问下载路径；后面的参数为要下载页面的文件类型的值。 + action_object.driver = webdriver.Firefox(firefox_profile=None) elif browser.upper() == 'FIREFOX-HEADLESS': - fp = webdriver.FirefoxProfile() + fp = webdriver.FirefoxProfile(profile_directory=downloaddir) fp.set_preference('browser.download.manager.showWhenStarting', False) # fp.set_preference('browser.download.folderList', 2) # 设置Firefox的默认下载文件夹。0是桌面；1是“我的下载”；2是自定义。 fp.set_preference('browser.download.dir', downloaddir) # 设置自定义路径时，定义的路径 - fp.set_preference('browser.helperApps.neverAsk.saveToDisk', 'binary/octet-stream') + fp.set_preference('browser.helperApps.neverAsk.saveToDisk', 'application/octet-stream') firefox_option = webdriver.FirefoxOptions() firefox_option.set_headless() action_object.driver = webdriver.Firefox(firefox_profile=fp, firefox_options=firefox_option) diff --git a/seleniumkeyword/data/readme.md b/seleniumkeyword/data/readme.md new file mode 100644 index 0000000..8e5f21b --- /dev/null +++ b/seleniumkeyword/data/readme.md @@ -0,0 +1 @@ +### 浏览器文件下载默认目录 \ No newline at end of file