This is an automated email from the ASF dual-hosted git repository.
sebb 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 ebd6ff9 Trailing spaces
ebd6ff9 is described below
commit ebd6ff9800d0150b2deacf6cdf8b8c526e13a255
Author: Sebb <[email protected]>
AuthorDate: Sun Oct 18 16:42:22 2020 +0100
Trailing spaces
---
lib/spec/lib/mail/mail_spec.rb | 16 +++++++--------
lib/spec/lib/svn_wunderbar_spec.rb | 2 +-
lib/whimsy/asf/yaml.rb | 2 +-
tools/collate_minutes.rb | 2 +-
www/board/agenda/daemon/session.rb | 2 +-
www/board/agenda/spec/actions_spec.rb | 2 +-
www/board/agenda/spec/index_spec.rb | 12 +++++------
www/board/agenda/spec/navigate_spec.rb | 14 ++++++-------
www/board/agenda/spec/other_views_spec.rb | 34 +++++++++++++++----------------
www/board/agenda/spec/reports_spec.rb | 30 +++++++++++++--------------
www/board/agenda/spec/secretary_spec.rb | 4 ++--
11 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/lib/spec/lib/mail/mail_spec.rb b/lib/spec/lib/mail/mail_spec.rb
index 9d629dc..bc2e6c7 100644
--- a/lib/spec/lib/mail/mail_spec.rb
+++ b/lib/spec/lib/mail/mail_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
require 'whimsy/asf'
describe ASF::Mail do
-
+
describe "ASF::Mail.to_canonical" do
it "should return address unaltered for invalid emails" do
email = 'textwithnoATsign'
@@ -13,16 +13,16 @@ describe ASF::Mail do
expect(ASF::Mail.to_canonical(email)).to eq(email)
email = '@textwithleadingAT'
expect(ASF::Mail.to_canonical(email)).to eq(email)
- end
+ end
it "should return address with downcased domain for valid emails" do
expect(ASF::Mail.to_canonical('ABC@DEF')).to eq('ABC@def')
- end
+ end
it "should return address with downcased domain and canonicalised name for
GMail emails" do
expect(ASF::Mail.to_canonical('[email protected]')).to
eq('[email protected]')
- end
+ end
it "should return address with downcased domain and canonicalised name for
Googlemail emails" do
expect(ASF::Mail.to_canonical('[email protected]')).to
eq('[email protected]')
- end
+ end
end
describe '.cansub(member, pmc_chair, ldap_pmcs)' do
@@ -33,7 +33,7 @@ describe ASF::Mail do
lists = ASF::Mail.cansub(false, false, nil)
it 'should return public lists only' do
if TEST_DATA
- expect(lists.length).to be >= 7
+ expect(lists.length).to be >= 7
else
expect(lists.length).to be >= 1000
end
@@ -71,7 +71,7 @@ describe ASF::Mail do
it 'should return chair lists only' do
mylists = ASF::Mail.cansub(false, true, nil)
if TEST_DATA
- expect(mylists.length).to be >= 7
+ expect(mylists.length).to be >= 7
else
expect(mylists.length).to be >= 1000
end
@@ -85,7 +85,7 @@ describe ASF::Mail do
it 'should return member lists only' do
mylists = ASF::Mail.cansub(true, false, nil)
if TEST_DATA
- expect(mylists.length).to be >= 7
+ expect(mylists.length).to be >= 7
else
expect(mylists.length).to be >= 1000
end
diff --git a/lib/spec/lib/svn_wunderbar_spec.rb
b/lib/spec/lib/svn_wunderbar_spec.rb
index b82ed3e..990b1f6 100644
--- a/lib/spec/lib/svn_wunderbar_spec.rb
+++ b/lib/spec/lib/svn_wunderbar_spec.rb
@@ -176,7 +176,7 @@ describe "ASF::SVN.update" do
expect(rc).to be(0)
expect(out['transcript'].class).to equal(Array)
# could look for "Checked out revision" and "Update to revision"
- expect(out['transcript'][-1]).to eql('+test') #
+ expect(out['transcript'][-1]).to eql('+test') #
end
end
diff --git a/lib/whimsy/asf/yaml.rb b/lib/whimsy/asf/yaml.rb
index 58c577d..b287b17 100644
--- a/lib/whimsy/asf/yaml.rb
+++ b/lib/whimsy/asf/yaml.rb
@@ -47,7 +47,7 @@ module YamlFile
res = yield(section, yaml) # get the updated JSON
return nil if res.nil? # i.e. don't update text
-
+
output = content.dup # don't mutate caller data
# Create the updated section with the correct indentation
diff --git a/tools/collate_minutes.rb b/tools/collate_minutes.rb
index 075e9a3..9aa4403 100755
--- a/tools/collate_minutes.rb
+++ b/tools/collate_minutes.rb
@@ -390,7 +390,7 @@ seen={}
next if title == 'April 2011 podling reports'
name_changes(title)
-
+
title.sub! /\s+\(.*\)$/, ''
title.sub! /^Apache(: Project)?/, ''
diff --git a/www/board/agenda/daemon/session.rb
b/www/board/agenda/daemon/session.rb
index c415c4a..ace25fd 100644
--- a/www/board/agenda/daemon/session.rb
+++ b/www/board/agenda/daemon/session.rb
@@ -75,7 +75,7 @@ class Session
session
end
- # load sessions from disk
+ # load sessions from disk
def self.load(files=nil)
@@semaphore.synchronize do
# default files to all files in the workdir and @@sessions hash
diff --git a/www/board/agenda/spec/actions_spec.rb
b/www/board/agenda/spec/actions_spec.rb
index 74ceef1..2464fef 100644
--- a/www/board/agenda/spec/actions_spec.rb
+++ b/www/board/agenda/spec/actions_spec.rb
@@ -370,7 +370,7 @@ feature 'server actions' do
end
if @commits
- @commits.each do |name, contents|
+ @commits.each do |name, contents|
Agenda[name].replace :mtime=>0
File.unlink "#{AGENDA_WORK}/#{name}"
end
diff --git a/www/board/agenda/spec/index_spec.rb
b/www/board/agenda/spec/index_spec.rb
index a0a519a..b3c7a10 100644
--- a/www/board/agenda/spec/index_spec.rb
+++ b/www/board/agenda/spec/index_spec.rb
@@ -9,9 +9,9 @@ feature 'index' do
visit '/2015-02-18/'
# header
- expect(page).to have_selector '.navbar-fixed-top.blank .navbar-brand',
+ expect(page).to have_selector '.navbar-fixed-top.blank .navbar-brand',
text: '2015-02-18'
- expect(page).not_to have_selector '.navbar-fixed-top .label-danger a'
+ expect(page).not_to have_selector '.navbar-fixed-top .label-danger a'
expect(page).to have_selector '#agenda', text: 'Agenda'
# navigation
@@ -35,7 +35,7 @@ feature 'index' do
expect(page).to have_selector 'a[href=ACE]', text: 'ACE'
# footer
- expect(page).to have_selector '.backlink[href="../2015-01-21/"]',
+ expect(page).to have_selector '.backlink[href="../2015-01-21/"]',
text: '2015-01-21'
expect(page).to have_selector 'button', text: 'refresh'
expect(page).to have_selector 'button', text: 'add item'
@@ -50,13 +50,13 @@ feature 'index' do
visit '/2015-01-21/'
# header
- expect(page).to have_selector '.navbar-fixed-top.blank .navbar-brand',
+ expect(page).to have_selector '.navbar-fixed-top.blank .navbar-brand',
text: '2015-01-21'
- expect(page).to have_selector '.navbar-fixed-top .label-danger a',
+ expect(page).to have_selector '.navbar-fixed-top .label-danger a',
text: '5'
# footer
- expect(page).to have_selector '.nextlink[href="../2015-02-18/"]',
+ expect(page).to have_selector '.nextlink[href="../2015-02-18/"]',
text: '2015-02-18'
expect(page).to have_selector 'button', text: 'refresh'
expect(page).to have_selector 'button', text: 'add item'
diff --git a/www/board/agenda/spec/navigate_spec.rb
b/www/board/agenda/spec/navigate_spec.rb
index 783429b..4e00b19 100644
--- a/www/board/agenda/spec/navigate_spec.rb
+++ b/www/board/agenda/spec/navigate_spec.rb
@@ -9,25 +9,25 @@ feature 'navigation', js: true 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',
+ expect(page).to have_selector '.navbar-fixed-top.reviewed .navbar-brand',
text: 'Clerezza'
# Right button should advance to Cocoon report
find('body').native.send_keys(:right)
- expect(page).to have_selector '.navbar-fixed-top.reviewed .navbar-brand',
+ expect(page).to have_selector '.navbar-fixed-top.reviewed .navbar-brand',
text: 'Cocoon'
- expect(page).to have_selector 'pre',
+ expect(page).to have_selector 'pre',
text: /needing board attention:\s*nothing/
- expect(page).to have_selector '.backlink[href="Clerezza"]',
+ expect(page).to have_selector '.backlink[href="Clerezza"]',
text: 'Clerezza'
- expect(page).to have_selector '.nextlink[href="Community-Development"]',
+ expect(page).to have_selector '.nextlink[href="Community-Development"]',
text: 'Community Development'
# Back button should return to Clerezza
page.evaluate_script('window.history.back()')
- expect(page).to have_selector '.navbar-fixed-top.reviewed .navbar-brand',
+ expect(page).to have_selector '.navbar-fixed-top.reviewed .navbar-brand',
text: 'Clerezza'
- expect(page).to have_selector 'pre',
+ expect(page).to have_selector 'pre',
text: /no issues requiring board attention/
expect(page).to have_selector '.backlink[href="Chukwa"]', text: 'Chukwa'
expect(page).to have_selector '.nextlink[href="Cocoon"]', text: 'Cocoon'
diff --git a/www/board/agenda/spec/other_views_spec.rb
b/www/board/agenda/spec/other_views_spec.rb
index c2e090a..39a815a 100644
--- a/www/board/agenda/spec/other_views_spec.rb
+++ b/www/board/agenda/spec/other_views_spec.rb
@@ -17,7 +17,7 @@ feature 'other reports' do
# unseen items
expect(page).to have_selector 'a.h4', text: 'Curator'
- expect(page).to have_selector 'pre',
+ expect(page).to have_selector 'pre',
text: /last PMC member and committer additions/
# seen items
@@ -32,7 +32,7 @@ feature 'other reports' do
it "should support queued/pending approvals and comments" do
visit '/2015-01-21/queue'
- expect(page).to have_selector :xpath,
+ expect(page).to have_selector :xpath,
'//p[1]/a[@href="queue/W3C-Relations"]', text: 'W3C Relations'
expect(page).to have_selector :xpath,
'//p[2]/a[@href="Security-Team"]', text: 'Security Team'
@@ -43,10 +43,10 @@ feature 'other reports' do
expect(page).to have_selector 'a.default', text: 'December 17, 2014'
expect(page).to have_selector 'dt a[href="Avro"]', text: 'Avro'
expect(page).to have_selector 'dd p', text: 'Nice report!'
- expect(page).to have_selector 'li',
+ expect(page).to have_selector 'li',
text: 'follow up with PMC for clarification'
- expect(page).to have_selector '#commit-text', text:
+ expect(page).to have_selector '#commit-text', text:
['Approve W3C Relations', 'Unapprove Security Team', 'Flag Attic',
'Comment on Avro',
'Update AI: follow up with PMC for clarification'].join(' ')
@@ -55,7 +55,7 @@ feature 'other reports' do
it "should follow the ready queue" do
visit '/2015-01-21/queue/Onami'
- expect(page).to have_selector '.navbar-fixed-top.reviewed .navbar-brand',
+ expect(page).to have_selector '.navbar-fixed-top.reviewed .navbar-brand',
text: 'Onami'
expect(page).to have_selector '.backlink[href="queue/MyFaces"]',
@@ -68,9 +68,9 @@ feature 'other reports' do
visit '/2015-01-21/shepherd/Sam'
# action items
- expect(page).to have_selector 'pre.report',
+ expect(page).to have_selector 'pre.report',
text: '* Sam: pursue a report for Abdera'
- expect(page).to have_selector 'pre.report em',
+ expect(page).to have_selector 'pre.report em',
text: "Clarification provided in this month's report."
# committee reports
@@ -78,10 +78,10 @@ feature 'other reports' do
text: 'Flink'
expect(page).to have_selector 'a.missing', text: 'Airavata'
expect(page).to have_selector 'h4', text: 'Comments'
- expect(page).to have_selector 'pre.comment span',
+ expect(page).to have_selector 'pre.comment span',
text: 'cm: great report!'
expect(page).to have_selector 'h4', text: 'Action Items'
- expect(page).to have_selector 'pre.report',
+ expect(page).to have_selector 'pre.report',
text: '* Chris: Please clarify what "voted on" means'
expect(page).to have_selector 'button[data-attach=AY]', text: 'flag'
expect(page).to have_selector '.shepherd button', text: 'send email'
@@ -99,7 +99,7 @@ feature 'other reports' do
it "should follow the shepherd queue" do
visit '/2015-02-18/shepherd/queue/Hama'
- expect(page).to have_selector '.navbar-fixed-top.missing .navbar-brand',
+ expect(page).to have_selector '.navbar-fixed-top.missing .navbar-brand',
text: 'Hama'
expect(page).to have_selector '.backlink[href="shepherd/queue/Forrest"]',
@@ -139,11 +139,11 @@ feature 'other reports' do
text: 'Set a date for the Annual Members Meeting'
expect(page).to have_selector '.nextlink[href="Unfinished-Business"]',
text: 'Unfinished Business'
- expect(page).to have_selector 'h3',
+ expect(page).to have_selector 'h3',
text: 'Action Items Captured During the Meeting'
expect(page).to have_selector 'a[href="http://example.com";]'
- expect(page).to have_selector 'span',
+ expect(page).to have_selector 'span',
text: '* Sam: Is the project ready for retirement?'
expect(page).to have_selector 'a.missing[href=JMeter]', text: 'JMeter'
expect(page).to have_selector 'span', text: '2015-01-21 ]'
@@ -156,7 +156,7 @@ feature 'other reports' do
File.write(yaml, YAML.dump(minutes.merge('started' => false)))
visit '/2015-02-18/Action-Items'
- expect(page).to have_selector 'p.alert-info',
+ expect(page).to have_selector 'p.alert-info',
text: 'Action Items have yet to be posted'
expect(page).to have_selector 'button.btn-primary', text: 'post actions'
ensure
@@ -166,7 +166,7 @@ feature 'other reports' do
it "should show flagged items" do
visit '/2015-02-18/flagged'
-
+
expect(page).to have_selector 'h3 a', text: 'Lenya'
expect(page).to have_selector 'h4', text: 'Comments'
expect(page).to have_selector 'pre span', text: 'rg: Last quarter'
@@ -174,16 +174,16 @@ feature 'other reports' do
it "should show missing items" do
visit '/2015-02-18/missing'
-
+
expect(page).to have_selector 'h3 a', text: 'Cassandra'
expect(page).to have_selector 'h4', text: 'Comments'
expect(page).to have_selector 'pre span', text: 'cm: Reminder email sent'
expect(page).to have_selector 'h4', text: 'Minutes'
- expect(page).to have_selector 'pre',
+ expect(page).to have_selector 'pre',
text: '@Sam: Is anyone on the PMC looking at the reminders?'
# reminders
- expect(page).to have_selector 'input[type=checkbox][name=selected]' +
+ expect(page).to have_selector 'input[type=checkbox][name=selected]' +
'[value=Airavata]'
expect(page).to have_selector 'button.btn-primary',
text: 'send initial reminders'
diff --git a/www/board/agenda/spec/reports_spec.rb
b/www/board/agenda/spec/reports_spec.rb
index df91c9f..b87fd36 100644
--- a/www/board/agenda/spec/reports_spec.rb
+++ b/www/board/agenda/spec/reports_spec.rb
@@ -9,18 +9,18 @@ feature 'report' do
visit '/2015-02-18/President'
# header
- expect(page).to have_selector '.navbar-fixed-top.available .navbar-brand',
+ expect(page).to have_selector '.navbar-fixed-top.available .navbar-brand',
text: 'President'
expect(page).to have_selector '#info'
- # body
- expect(page).to have_selector 'pre',
+ # body
+ expect(page).to have_selector 'pre',
text: 'Sally produced our first quarterly report'
expect(page).to have_selector '.private',
text: %r{<private>\s*whisper, whisper, whisper\s*</private>}
- expect(page).to have_selector 'a[href="Executive-Assistant"]',
+ expect(page).to have_selector 'a[href="Executive-Assistant"]',
text: 'Executive Assistant'
- expect(page).to have_selector '.pres-missing[href="Travel-Assistance"]',
+ expect(page).to have_selector '.pres-missing[href="Travel-Assistance"]',
text: 'Travel Assistance'
# footer
@@ -28,7 +28,7 @@ feature 'report' do
text: 'Chairman'
expect(page).to have_selector 'button', text: 'add comment'
expect(page).to have_selector 'button', text: 'edit report'
- expect(page).to have_selector '.nextlink[href="Treasurer"]',
+ expect(page).to have_selector '.nextlink[href="Treasurer"]',
text: 'Treasurer'
end
@@ -36,7 +36,7 @@ feature 'report' do
visit '/2015-02-18/ACE'
# header
- expect(page).to have_selector '.navbar-fixed-top.reviewed .navbar-brand',
+ expect(page).to have_selector '.navbar-fixed-top.reviewed .navbar-brand',
text: 'ACE'
# info
@@ -46,19 +46,19 @@ feature 'report' do
expect(page).to have_selector 'dd', text: /, sr,/
# content
- expect(page).to have_selector 'pre',
+ expect(page).to have_selector 'pre',
text: /User reports with questions and issues about scripting/
# no comments
expect(page).not_to have_selector 'h4#comments', text: 'Comments'
# footer
- expect(page).to have_selector '.backlink[href="Abdera"]',
+ expect(page).to have_selector '.backlink[href="Abdera"]',
text: 'Abdera'
expect(page).to have_selector 'button', text: 'add comment'
expect(page).to have_selector 'button', text: 'approve'
expect(page).to have_selector 'button', text: 'edit report'
- expect(page).to have_selector '.nextlink[href="ActiveMQ"]',
+ expect(page).to have_selector '.nextlink[href="ActiveMQ"]',
text: 'ActiveMQ'
# hidden forms
@@ -90,7 +90,7 @@ feature 'report' do
expect(page).to have_selector 'h4#comments', text: 'Comments'
expect(page).to have_selector 'button', text: 'add comment'
expect(page).not_to have_selector 'button', text: 'approve'
- expect(page).to have_selector 'pre.comment',
+ expect(page).to have_selector 'pre.comment',
text: "gs: notified. heard back already: they'll submit next month."
@@ -106,7 +106,7 @@ feature 'report' do
it "should show action items" do
visit '/2015-01-21/DirectMemory'
- expect(page).to have_selector 'pre.report',
+ expect(page).to have_selector 'pre.report',
text: '* Sam: Follow up with a more complete report next month'
expect(page).to have_selector 'h4 a[href="Action-Items"]',
text: 'Action Items'
@@ -116,7 +116,7 @@ feature 'report' do
visit '/2015-02-18/Drill'
expect(page).to have_selector 'h4', text: 'Minutes'
- expect(page).to have_selector 'pre',
+ expect(page).to have_selector 'pre',
text: '@Brett: Are hangouts documents so non-attendees can participate
later'
end
@@ -124,9 +124,9 @@ feature 'report' do
it "should show reports with warnings" do
visit '/2015-01-21/Change-Labs-Chair'
- expect(page).to have_selector '.navbar-fixed-top.missing .navbar-brand',
+ expect(page).to have_selector '.navbar-fixed-top.missing .navbar-brand',
text: 'Change Labs Chair'
- expect(page).to have_selector 'ul.missing li',
+ expect(page).to have_selector 'ul.missing li',
text: 'Heading is not indented 4 spaces'
end
end
diff --git a/www/board/agenda/spec/secretary_spec.rb
b/www/board/agenda/spec/secretary_spec.rb
index e6a1d2e..9ffb344 100644
--- a/www/board/agenda/spec/secretary_spec.rb
+++ b/www/board/agenda/spec/secretary_spec.rb
@@ -45,7 +45,7 @@ feature 'report' do
expect(page).to have_selector 'button', text: 'edit minutes'
expect(page).to have_selector 'h3', text: 'Comments'
expect(page).to have_selector 'pre', text: 'sr: Reminder email sent'
- expect(page).to have_selector 'textarea',
+ expect(page).to have_selector 'textarea',
text: '@Sam: Is anyone on the PMC looking at the reminders?'
expect(page).to have_selector 'button', text: 'Delete'
end
@@ -115,7 +115,7 @@ feature 'report' do
timestamp = Time.now.gmtime.to_f * 1000
IO.write file, YAML.dump(YAML.load(minutes).
merge('complete' => timestamp, 'Adjournment' => '11:45'))
- yield
+ yield
ensure
IO.write file, minutes
end
