[whimsy] branch signature_not_armored updated: Update incomplete.json.rb
This is an automated email from the ASF dual-hosted git repository.
clr pushed a commit to branch signature_not_armored
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/signature_not_armored by this
push:
new 5356c1b Update incomplete.json.rb
5356c1b is described below
commit 5356c1b430305e0021707fff3d3d18262f13cb3b
Author: Craig L Russell
AuthorDate: Tue Mar 29 17:26:30 2022 -0700
Update incomplete.json.rb
---
www/secretary/workbench/views/actions/incomplete.json.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/www/secretary/workbench/views/actions/incomplete.json.rb
b/www/secretary/workbench/views/actions/incomplete.json.rb
index 4198543..8246ecd 100644
--- a/www/secretary/workbench/views/actions/incomplete.json.rb
+++ b/www/secretary/workbench/views/actions/incomplete.json.rb
@@ -23,6 +23,7 @@ REASONS = {
'@unreadable_scan' => 'the scan is not readable or not complete',
'@wrong_identity' => 'the public key does not match the name/email on the
form',
'@validation_failed' => 'gpg validation failed',
+ '@signature_not_armored' => 'gpg signature_not_armored',
}
# send rejection email
[whimsy] 01/01: Update parts.js.rb
This is an automated email from the ASF dual-hosted git repository.
clr pushed a commit to branch signature_not_armored
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 727d6b13bb29105af29065a96444a61df601409a
Author: Craig L Russell
AuthorDate: Tue Mar 29 17:23:14 2022 -0700
Update parts.js.rb
Add "gpg signature not armored"
---
www/secretary/workbench/views/parts.js.rb | 9 +
1 file changed, 9 insertions(+)
diff --git a/www/secretary/workbench/views/parts.js.rb
b/www/secretary/workbench/views/parts.js.rb
index bcca669..42efe0f 100644
--- a/www/secretary/workbench/views/parts.js.rb
+++ b/www/secretary/workbench/views/parts.js.rb
@@ -22,6 +22,7 @@ class Parts < Vue
@unreadable_scan = false
@wrong_identity = false
@validation_failed = false
+@signature_not_armored = false
end
@@ -194,6 +195,7 @@ class Parts < Vue
_input type: 'hidden', name: 'unreadable_scan', value:
@unreadable_scan
_input type: 'hidden', name: 'wrong_identity', value:
@wrong_identity
_input type: 'hidden', name: 'validation_failed', value:
@validation_failed
+_input type: 'hidden', name: 'signature_not_armored', value:
@signature_not_armored
# Defer processing (must be part of POST block)
@@ -295,6 +297,13 @@ class Parts < Vue
_span ' gpg key validation failed'
end
end
+ _li do
+_label do
+ _input type: 'checkbox', checked: @signature_not_armored,
+ onClick: -> {@signature_not_armored =
!@signature_not_armored}
+ _span ' gpg signature not armored'
+end
+ end
end
_label do
[whimsy] branch signature_not_armored created (now 727d6b1)
This is an automated email from the ASF dual-hosted git repository. clr pushed a change to branch signature_not_armored in repository https://gitbox.apache.org/repos/asf/whimsy.git. at 727d6b1 Update parts.js.rb This branch includes the following new commits: new 727d6b1 Update parts.js.rb The 1 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.
[whimsy] branch master updated: Lint
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 2296866 Lint
new 1d7b08c Merge branch 'master' of
https://gitbox.apache.org/repos/asf/whimsy
2296866 is described below
commit 2296866eadbec793cb3f4f4604d01e2448d7eb17
Author: Sebb
AuthorDate: Tue Mar 29 17:23:24 2022 +0100
Lint
---
lib/spec/lib/svn_spec.rb | 8
lib/whimsy/asf/podling.rb | 12 +---
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/lib/spec/lib/svn_spec.rb b/lib/spec/lib/svn_spec.rb
index 10bc1e8..b5a3785 100644
--- a/lib/spec/lib/svn_spec.rb
+++ b/lib/spec/lib/svn_spec.rb
@@ -264,7 +264,7 @@ describe ASF::SVN do
it "svn('info', path) should return 'Name: path'" do
repo = File.join(ASF::SVN.svnurl('attic-xdocs'),'_template.xml')
- out, err = ASF::SVN.svn('info',repo)
+ out, _err = ASF::SVN.svn('info',repo)
expect(out).to match(/^Name: _template.xml$/)
end
it "svn('info', [path]) should return 'Name: path'" do
@@ -405,15 +405,15 @@ describe ASF::SVN do
describe "ASF::SVN.getlisting" do
set_svnroot # need local test data here
it "getlisting('emeritus') returns array of 1" do
- tag,list = ASF::SVN.getlisting('emeritus')
+ _tag, list = ASF::SVN.getlisting('emeritus')
expect(list).to eq(['emeritus1.txt'])
end
it "getlisting('emeritus-requests-received') returns array of 1" do
- tag,list = ASF::SVN.getlisting('emeritus-requests-received')
+ _tag, list = ASF::SVN.getlisting('emeritus-requests-received')
expect(list).to eq(['emeritus3.txt'])
end
it "getlisting('emeritus-requests-received,nil,true,true') returns array
of [epoch,name]" do
- tag,list =
ASF::SVN.getlisting('emeritus-requests-received',nil,true,true)
+ _tag, list =
ASF::SVN.getlisting('emeritus-requests-received',nil,true,true)
expect(list).to eq([['1594814364','emeritus3.txt']])
end
end
diff --git a/lib/whimsy/asf/podling.rb b/lib/whimsy/asf/podling.rb
index 812acbb..4bf90ff 100644
--- a/lib/whimsy/asf/podling.rb
+++ b/lib/whimsy/asf/podling.rb
@@ -31,9 +31,6 @@ module ASF
# userid of the champion, from podlings.xml
attr_accessor :champion
-# list of months in the normal reporting schedule for this podling.
-attr_accessor :reporting
-
# if reporting monthly, a list of months reports are expected. Can also
# ge nil or an empty list. From podlings.xml.
attr_accessor :monthly
@@ -55,6 +52,7 @@ module ASF
# create a podling from a Nokogiri node built from podlings.xml
def initialize(node)
+ @mtime = nil
@name = node['name']
@resource = node['resource']
# Validate resource for later use resource can contain '-' and '.'
(lucene.net)
@@ -70,11 +68,11 @@ module ASF
@mentors = node.search('mentor').map { |mentor| mentor['username'] }
@champion = node.at('champion')['availid'] if node.at('champion')
- @reporting = node.at('reporting') if node.at('reporting')
- @monthly = @reporting.text.split(/,\s*/) if @reporting&.text
+ @reporting = node.at('reporting') || nil # ensure variable is defined
+ @monthly = @reporting&.text&.split(/,\s*/)
- @resolutionLink = node.at('resolution')['link'] if node.at('resolution')
- @resolutionURL = node.at('resolution')['url'] if node.at('resolution')
+ @resolutionLink = node.at('resolution') ? node.at('resolution')['link']
: nil
+ @resolutionURL = node.at('resolution') ? node.at('resolution')['url'] :
nil
# Note: the following optional elements are not currently processed:
# - resolution (except for resolution/@link)
[whimsy] branch master updated: see if sending the error to STDERR helps
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 f1825c4 see if sending the error to STDERR helps
f1825c4 is described below
commit f1825c4a4e4cdeae58e0c2ea6228a7b3b22b
Author: Sam Ruby
AuthorDate: Tue Mar 29 11:19:07 2022 -0400
see if sending the error to STDERR helps
---
www/board/agenda/spec/vue_server.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/www/board/agenda/spec/vue_server.rb
b/www/board/agenda/spec/vue_server.rb
index b5a28ab..97bc2ef 100644
--- a/www/board/agenda/spec/vue_server.rb
+++ b/www/board/agenda/spec/vue_server.rb
@@ -133,7 +133,7 @@ class VueServer
end
request.on 'error' do |error|
-console.log "VueServer error: #{error.message}"
+console.error "VueServer error: #{error.message}"
end
request.on 'end' do
[whimsy] branch master updated: Fixups
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 0102291 Fixups
0102291 is described below
commit 010229184404a1f4d3b2f0b1af3dfc0a984e10ee
Author: Sebb
AuthorDate: Tue Mar 29 16:01:04 2022 +0100
Fixups
---
.github/workflows/unittestnavigation.yml | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/unittestnavigation.yml
b/.github/workflows/unittestnavigation.yml
index cb07c13..62a879c 100644
--- a/.github/workflows/unittestnavigation.yml
+++ b/.github/workflows/unittestnavigation.yml
@@ -29,12 +29,17 @@ jobs:
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
-- name: test agenda navigation code
+- name: Install Gems
run: |
cd www/board/agenda
bundle install
+- name: Set up LDAP
+ run: |
# need to run the ruby that has all the gems installed
sudo $(which ruby) -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
+- name: test agenda navigation code
+ run: |
+cd www/board/agenda
# --pattern does not work (appears to be overridden)
# so use exclude to drop all but the one we want
echo '--exclude-pattern spec/[a-mo-z]*_spec.rb' >.rspec
[whimsy] branch master updated: Also need LDAP ...
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 8e3c1d0 Also need LDAP ... 8e3c1d0 is described below commit 8e3c1d059aa545d20f1bf1df4b2e0576136e75fb Author: Sebb AuthorDate: Tue Mar 29 15:54:37 2022 +0100 Also need LDAP ... --- .github/workflows/unittestnavigation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/unittestnavigation.yml b/.github/workflows/unittestnavigation.yml index be3dfca..cb07c13 100644 --- a/.github/workflows/unittestnavigation.yml +++ b/.github/workflows/unittestnavigation.yml @@ -33,6 +33,8 @@ jobs: run: | cd www/board/agenda bundle install +# need to run the ruby that has all the gems installed +sudo $(which ruby) -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure" # --pattern does not work (appears to be overridden) # so use exclude to drop all but the one we want echo '--exclude-pattern spec/[a-mo-z]*_spec.rb' >.rspec
[whimsy] branch master updated: Typo
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 c2deb99 Typo c2deb99 is described below commit c2deb997ee196fbb1b320f2cc98a3177687863d7 Author: Sebb AuthorDate: Tue Mar 29 15:30:23 2022 +0100 Typo --- .github/workflows/unittestnavigation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unittestnavigation.yml b/.github/workflows/unittestnavigation.yml index 2ccb6ed..a7b7dcb 100644 --- a/.github/workflows/unittestnavigation.yml +++ b/.github/workflows/unittestnavigation.yml @@ -33,4 +33,4 @@ jobs: run: | cd www/board/agenda bundle install -TEST_AO_PAGE=1 bundle exec rspec spec/navigation_spec.rb +TEST_AO_PAGE=1 bundle exec rspec spec/navigate_spec.rb
[whimsy] branch master updated: oops
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 0caf5b0 oops 0caf5b0 is described below commit 0caf5b030f68a2b7ab319bfb58497f85e9199118 Author: Sebb AuthorDate: Tue Mar 29 13:12:59 2022 +0100 oops --- .github/workflows/unittestnavigation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/unittestnavigation.yml b/.github/workflows/unittestnavigation.yml index b45b0ca..2ccb6ed 100644 --- a/.github/workflows/unittestnavigation.yml +++ b/.github/workflows/unittestnavigation.yml @@ -32,4 +32,5 @@ jobs: - name: test agenda navigation code run: | cd www/board/agenda +bundle install TEST_AO_PAGE=1 bundle exec rspec spec/navigation_spec.rb
[whimsy] branch master updated: All navigation to be tested separately
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 6630669 All navigation to be tested separately
6630669 is described below
commit 663066945284395618fa1dbf09af5cd8de1e8939
Author: Sebb
AuthorDate: Tue Mar 29 13:02:52 2022 +0100
All navigation to be tested separately
---
.github/workflows/unittestagenda.yml | 2 +-
.../{unittestagenda.yml => unittestnavigation.yml} | 23 +-
2 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/unittestagenda.yml
b/.github/workflows/unittestagenda.yml
index 3ce03b7..67bfe8c 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -45,4 +45,4 @@ jobs:
- name: test agenda code
run: |
cd www/board/agenda
-TEST_AO_PAGE=1 bundle exec rake
+SKIP_NAVIGATION=1 bundle exec rake
diff --git a/.github/workflows/unittestagenda.yml
b/.github/workflows/unittestnavigation.yml
similarity index 60%
copy from .github/workflows/unittestagenda.yml
copy to .github/workflows/unittestnavigation.yml
index 3ce03b7..b45b0ca 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestnavigation.yml
@@ -1,11 +1,6 @@
-name: Unit test agenda
+name: Unit test navigation
+# Separate job for debugging navigation issues
on:
- push:
-paths:
- - '**/unittestagenda.yml'
- - 'www/board/agenda/**'
- - 'lib/**'
-
workflow_dispatch:
jobs:
@@ -13,7 +8,7 @@ jobs:
strategy:
fail-fast: true
matrix:
-os: [ubuntu-20.04, 'macos-latest']
+os: [ubuntu-20.04]
ruby: [2.7]
runs-on: ${{ matrix.os }}
steps:
@@ -34,15 +29,7 @@ jobs:
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
-- name: setup agenda 1
- run: |
-cd www/board/agenda
-bundle install
-- name: setup agenda 2
- # need to run the ruby that has all the gems installed
- run: |
-sudo $(which ruby) -I $PWD/lib -r whimsy/asf -e "ASF::LDAP.configure"
-- name: test agenda code
+- name: test agenda navigation code
run: |
cd www/board/agenda
-TEST_AO_PAGE=1 bundle exec rake
+TEST_AO_PAGE=1 bundle exec rspec spec/navigation_spec.rb
[whimsy] branch master updated: Default to running navigation
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 09fc754 Default to running navigation
09fc754 is described below
commit 09fc75422ceef37fb82a990934853730e228135d
Author: Sebb
AuthorDate: Tue Mar 29 12:51:05 2022 +0100
Default to running navigation
Also try another simpler check
---
.github/workflows/unittestagenda.yml | 2 +-
www/board/agenda/spec/navigate_spec.rb | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/unittestagenda.yml
b/.github/workflows/unittestagenda.yml
index 760c0e9..3ce03b7 100644
--- a/.github/workflows/unittestagenda.yml
+++ b/.github/workflows/unittestagenda.yml
@@ -11,7 +11,7 @@ on:
jobs:
test:
strategy:
- fail-fast: false
+ fail-fast: true
matrix:
os: [ubuntu-20.04, 'macos-latest']
ruby: [2.7]
diff --git a/www/board/agenda/spec/navigate_spec.rb
b/www/board/agenda/spec/navigate_spec.rb
index 29ce396..b485527 100644
--- a/www/board/agenda/spec/navigate_spec.rb
+++ b/www/board/agenda/spec/navigate_spec.rb
@@ -16,11 +16,11 @@ end
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']
-# Looks like chromedriver cannot cope for some reason
-skip "headless browser test not run under GitHub Actions" if
ENV['GITHUB_ACTIONS']
+skip "headless browser test not run" if ENV['SKIP_NAVIGATION']
visit '/2015-02-18/Clerezza'
+expect(page).to have_content('Clerezza') # basic test
+
expect(page).to have_selector '.navbar-fixed-top.reviewed .navbar-brand',
text: 'Clerezza'
