You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2017/08/19 12:54:47 UTC
[whimsy] 03/04: Revert "switch to selenium_chrome_headless"
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 65a96aa736819ed581ab813c559204e2d26b2f4f
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Aug 19 08:45:43 2017 -0400
Revert "switch to selenium_chrome_headless"
This reverts commit 6c5b4f7e9c350bc1de660c37af113d802cf94837.
---
www/board/agenda/Gemfile | 2 +-
www/board/agenda/spec/navigate_spec.rb | 2 +-
www/board/agenda/spec/react_server.rb | 1 -
www/board/agenda/spec/spec_helper.rb | 14 ++++++++++++--
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/www/board/agenda/Gemfile b/www/board/agenda/Gemfile
index 6f37168..7184716 100644
--- a/www/board/agenda/Gemfile
+++ b/www/board/agenda/Gemfile
@@ -32,7 +32,7 @@ gem 'rubyXL'
group :test do
gem 'rspec'
gem 'capybara'
- gem 'selenium-webdriver'
+ gem 'poltergeist'
end
group :development do
diff --git a/www/board/agenda/spec/navigate_spec.rb b/www/board/agenda/spec/navigate_spec.rb
index a3e09dd..9afb03c 100644
--- a/www/board/agenda/spec/navigate_spec.rb
+++ b/www/board/agenda/spec/navigate_spec.rb
@@ -11,7 +11,7 @@ feature 'navigation', js: true do
text: 'Clerezza'
# Right button should advance to Cocoon report
- find('body').native.send_keys(:right)
+ find('body').native.send_keys(:Right)
expect(page).to have_selector '.navbar-fixed-top.reviewed .navbar-brand',
text: 'Cocoon'
expect(page).to have_selector 'pre',
diff --git a/www/board/agenda/spec/react_server.rb b/www/board/agenda/spec/react_server.rb
index 33b4ed4..acec0b4 100644
--- a/www/board/agenda/spec/react_server.rb
+++ b/www/board/agenda/spec/react_server.rb
@@ -61,7 +61,6 @@ class ReactServer
response = http.request(request)
Process.wait(@@pid)
@@pid = nil
- rescue Errno::ECONNREFUSED
end
# the server itself
diff --git a/www/board/agenda/spec/spec_helper.rb b/www/board/agenda/spec/spec_helper.rb
index a8739e6..f5e6ea5 100644
--- a/www/board/agenda/spec/spec_helper.rb
+++ b/www/board/agenda/spec/spec_helper.rb
@@ -9,13 +9,23 @@ $LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
ENV['RACK_ENV'] = 'test'
ENV['REMOTE_USER'] = 'test'
require 'capybara/rspec'
-require 'selenium-webdriver'
require_relative '../main'
Capybara.app = Sinatra::Application
-Capybara.javascript_driver = :selenium_chrome_headless
+Capybara.javascript_driver = :poltergeist
require 'whimsy/asf/rack'
+# only load poltergeist driver for JavaScript if phantomjs is available
+if
+ ENV['PATH'].split(File::PATH_SEPARATOR).any? do |path|
+ File.exist? File.join(path, 'phantomjs')
+ end
+then
+ require 'capybara/poltergeist'
+else
+ puts STDERR, "phantomjs is not available in PATH, not loading poltergeist"
+end
+
module MockServer
# wunderbar environment
def _
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.