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:44 UTC
[whimsy] branch master updated (c271ae8 -> a8ce17d)
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.
from c271ae8 try adding chrome
new c155ed9 add a travis mail relay
new 9de3245 Revert "try adding chrome"
new 65a96aa Revert "switch to selenium_chrome_headless"
new a8ce17d skip headless browser tests on Travis for now
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 3 ---
tools/travis-relay.rb | 42 ++++++++++++++++++++++++++++++++++
www/board/agenda/Gemfile | 2 +-
www/board/agenda/spec/navigate_spec.rb | 4 +++-
www/board/agenda/spec/react_server.rb | 1 -
www/board/agenda/spec/spec_helper.rb | 14 ++++++++++--
6 files changed, 58 insertions(+), 8 deletions(-)
create mode 100644 tools/travis-relay.rb
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].
[whimsy] 03/04: Revert "switch to selenium_chrome_headless"
Posted by ru...@apache.org.
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>.
[whimsy] 02/04: Revert "try adding chrome"
Posted by ru...@apache.org.
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 9de3245aff94c7ce67f040bcf6a3985eaa01926f
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Aug 19 08:45:14 2017 -0400
Revert "try adding chrome"
This reverts commit c271ae8003f9eb9a18c10cb98e13bd9ed036a195.
---
.travis.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 3e5fff0..d1ca558 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,9 +2,6 @@ language: ruby
os:
- osx
- linux
-dist: trusty
-addons:
- chrome: beta
rvm: # http://rubies.travis-ci.org/
- 2.4.0 # https://github.com/travis-ci/travis-ci/issues/7848
before_install:
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.
[whimsy] 01/04: add a travis mail relay
Posted by ru...@apache.org.
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 c155ed97c1323b35d65424a3e17ac39ff1d6e512
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Aug 19 08:43:53 2017 -0400
add a travis mail relay
---
tools/travis-relay.rb | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/tools/travis-relay.rb b/tools/travis-relay.rb
new file mode 100644
index 0000000..4e380e9
--- /dev/null
+++ b/tools/travis-relay.rb
@@ -0,0 +1,42 @@
+#
+# forward travis notifications to notifications@whimsical.
+#
+# 'To' header will be replaced
+# 'From' header will effectively be replaced
+# Transport headers names will be prepended with 'X-'
+# Original content headers will be dropped (and recreated).
+#
+
+munge = %w(received delivered-to)
+skip = %w(content-type content-transfer-encoding)
+
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'mail'
+require 'whimsy/asf'
+
+ASF::Mail.configure
+
+original = Mail.new(STDIN.read)
+exit unless original.from.include? "builds@travis-ci.org"
+
+copy = Mail.new
+
+# copy/munge/skip headers
+original.header.fields.each do |field|
+ name = field.name
+ next if skip.include? name.downcase
+ name = "X-#{name}" if munge.include? name.downcase
+
+ if name.downcase == 'to'
+ copy.header['To'] = '<no...@whimsical.apache.org>'
+ else
+ copy.header[name] = field.value
+ end
+end
+
+# copy content
+copy.text_part = original.text_part if original.text_part
+copy.html_part = original.html_part if original.html_part
+
+# deliver
+copy.deliver!
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.
[whimsy] 04/04: skip headless browser tests on Travis for now
Posted by ru...@apache.org.
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 a8ce17d4e5cc294cb3f2deadec18d5d0f1dc2d1a
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Aug 19 08:54:30 2017 -0400
skip headless browser tests on Travis for now
---
www/board/agenda/spec/navigate_spec.rb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/www/board/agenda/spec/navigate_spec.rb b/www/board/agenda/spec/navigate_spec.rb
index 9afb03c..8a9589e 100644
--- a/www/board/agenda/spec/navigate_spec.rb
+++ b/www/board/agenda/spec/navigate_spec.rb
@@ -6,6 +6,8 @@ require_relative 'spec_helper'
feature 'navigation', js: true do
it "should navigate to the Cocoon report and back" do
+ skip "headless browser test not run on Travis" if ENV['TRAVIS']
+
visit '/2015-02-18/Clerezza'
expect(page).to have_selector '.navbar-fixed-top.reviewed .navbar-brand',
text: 'Clerezza'
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.