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
The following commit(s) were added to refs/heads/master by this push:
new cf20341 add ldaps URI scheme
cf20341 is described below
commit cf20341192abcc21c52650fec65e4b62f0075e38
Author: Sam Ruby <[email protected]>
AuthorDate: Tue Jan 23 12:30:36 2018 -0500
add ldaps URI scheme
---
lib/whimsy/asf/ldap.rb | 10 +++++-----
www/board/agenda/Gemfile | 6 +++---
www/board/agenda/main.rb | 2 ++
www/board/agenda/spec/navigate_spec.rb | 2 +-
www/board/agenda/spec/spec_helper.rb | 14 ++------------
5 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index 845d153..822ac23 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -48,11 +48,11 @@ module ASF
# *
https://github.com/apache/infrastructure-puppet/blob/deployment/data/common.yaml
(ldapserver::slapd_peers)
# Updated 2018-01-23
HOSTS = %w(
- ldap1-lw-us.apache.org:636
- ldap1-lw-eu.apache.org:636
- ldap1-ec2-va.apache.org:636
- ldap1-il-eu.apache.org:636
- ldap2-lw-us.apache.org:636
+ ldaps://ldap1-lw-us.apache.org:636
+ ldaps://ldap1-lw-eu.apache.org:636
+ ldaps://ldap1-ec2-va.apache.org:636
+ ldaps://ldap1-il-eu.apache.org:636
+ ldaps://ldap2-lw-us.apache.org:636
)
# Mutex preventing simultaneous connections to LDAP from a single process
diff --git a/www/board/agenda/Gemfile b/www/board/agenda/Gemfile
index 97fea07..434e65d 100644
--- a/www/board/agenda/Gemfile
+++ b/www/board/agenda/Gemfile
@@ -12,8 +12,8 @@ else
end
gem 'rake'
-gem 'wunderbar'
-gem 'ruby2js'
+gem 'wunderbar', path: '/Users/rubys/git/wunderbar'
+gem 'ruby2js', path: '/Users/rubys/git/ruby2js'
gem 'sinatra', '~> 2.0'
gem 'nokogumbo'
gem 'execjs', ('<2.5.1' if RUBY_VERSION =~ /^1/)
@@ -36,7 +36,7 @@ group :test do
gem 'rspec'
gem 'puma'
gem 'capybara'
- gem 'poltergeist'
+ gem 'selenium-webdriver'
end
group :development do
diff --git a/www/board/agenda/main.rb b/www/board/agenda/main.rb
index 9d615b4..281a651 100755
--- a/www/board/agenda/main.rb
+++ b/www/board/agenda/main.rb
@@ -10,6 +10,8 @@ require 'whimsy/asf/board'
require 'wunderbar/sinatra'
require 'wunderbar/vue'
require 'wunderbar/bootstrap/theme'
+require 'ruby2js/es2015'
+require 'ruby2js/strict'
require 'ruby2js/filter/functions'
require 'ruby2js/filter/require'
diff --git a/www/board/agenda/spec/navigate_spec.rb
b/www/board/agenda/spec/navigate_spec.rb
index 8a9589e..4e00b19 100644
--- a/www/board/agenda/spec/navigate_spec.rb
+++ b/www/board/agenda/spec/navigate_spec.rb
@@ -13,7 +13,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/spec_helper.rb
b/www/board/agenda/spec/spec_helper.rb
index f5e6ea5..31ba37a 100644
--- a/www/board/agenda/spec/spec_helper.rb
+++ b/www/board/agenda/spec/spec_helper.rb
@@ -9,23 +9,13 @@ $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 = :poltergeist
+Capybara.javascript_driver = :selenium_chrome_headless
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
[email protected].
