Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ rvm:
before_script:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- "gem uninstall rake --force"
- "gem install rake -v 0.9.2.2"
- "bundle install"

notifications:
email:
- watirmark-dev@blackbaud.com
- watirmark-dev@blackbaud.com
20 changes: 13 additions & 7 deletions lib/watirmark/session.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,21 @@ def initialize
end

def default_chrome_profile
profile = Selenium::WebDriver::Chrome::Profile.new

download_directory = File.join(Configuration.instance.projectpath, "reports", "downloads")
download_directory.gsub!("/", "\\") if Selenium::WebDriver::Platform.windows?

{
:download => {
:prompt_for_download => false,
:default_directory => download_directory
}
}

profile['download.prompt_for_download'] = false
profile['download.default_directory'] = download_directory

# Enable Flash
profile['profile.default_content_setting_values.plugins'] = 1
profile['profile.content_settings.plugin_whitelist.adobe-flash-player'] = 1
profile['profile.content_settings.exceptions.plugins.*,*.per_resource.adobe-flash-player'] = 1

profile
end

def default_firefox_profile
Expand Down Expand Up @@ -202,7 +208,7 @@ def new_watir_browser
when :sauce
Watir::Browser.new use_sauce
when :chrome
Watir::Browser.new :chrome, prefs: config.chrome_profile, http_client: client
Watir::Browser.new :chrome, prefs: config.chrome_profile, http_client: client, switches: %w[--disable-infobars]
else
Watir::Browser.new config.webdriver.to_sym, http_client: client
end
Expand Down
2 changes: 1 addition & 1 deletion lib/watirmark/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Watirmark
module Version
STRING = '5.29.4'
STRING = '5.29.5'
end
end