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
commit da7f4456add6d0d6fc33d509382d67965277c0b8 Author: Sebb <[email protected]> AuthorDate: Mon Jul 6 16:40:52 2020 +0100 templates no longer needed --- lib/spec/lib/svn_spec.rb | 4 +--- lib/spec/spec_helper.rb | 6 +++++- lib/test/svn/{templates => minutes}/README.txt | 0 repository.yml | 9 +++------ 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/spec/lib/svn_spec.rb b/lib/spec/lib/svn_spec.rb index 8439be7..3edd543 100644 --- a/lib/spec/lib/svn_spec.rb +++ b/lib/spec/lib/svn_spec.rb @@ -5,8 +5,6 @@ require 'spec_helper' require 'whimsy/asf' require 'wunderbar' -SAMPLE_SVN_NAME = 'minutes' # name of checkout of public SVN dir -SAMPLE_SVN_URL_RE = %r{https://.+/minutes} SAMPLE_MISSING_NAME = '__templates' # no such entry SAMPLE_ALIAS = 'Bills' # depth: 'skip' @@ -120,7 +118,7 @@ describe ASF::SVN do res = ASF::SVN.private_public expect(res.size()).to equal(2) expect(res[0].size).to equal(14) # will need to be adjusted from time to time - expect(res[1].size).to equal(9) # ditto. + expect(res[1].size).to equal(8) # ditto. end end diff --git a/lib/spec/spec_helper.rb b/lib/spec/spec_helper.rb index e9f74bd..e6930b8 100644 --- a/lib/spec/spec_helper.rb +++ b/lib/spec/spec_helper.rb @@ -1,13 +1,17 @@ $LOAD_PATH.unshift '/srv/whimsy/lib' require 'whimsy/asf' + +SAMPLE_SVN_NAME = 'minutes' # name of checkout of public SVN dir +SAMPLE_SVN_URL_RE = %r{https://.+/minutes} + # Override with test data if there is no checkout available (allows local use) if ENV['RAKE_TEST'] == 'TRUE' or not (ASF::SVN.find('apmail_bin') and ASF::SVN.find('board')) TEST_DATA = true # Test data is smaller so some tests need adjusting puts "Overriding data directories" ASF::SVN['apmail_bin'] = File.expand_path('../test/svn/apmail_bin', __dir__) ASF::SVN['board'] = File.expand_path('../test/svn/board', __dir__) - ASF::SVN['templates'] = File.expand_path('../test/svn/templates', __dir__) + ASF::SVN[SAMPLE_SVN_NAME] = File.expand_path('../test/svn/minutes', __dir__) ASF::Config[:subscriptions] = File.expand_path('../test/subscriptions', __dir__) else TEST_DATA = false diff --git a/lib/test/svn/templates/README.txt b/lib/test/svn/minutes/README.txt similarity index 100% rename from lib/test/svn/templates/README.txt rename to lib/test/svn/minutes/README.txt diff --git a/repository.yml b/repository.yml index ae224d2..47c5b3a 100644 --- a/repository.yml +++ b/repository.yml @@ -65,10 +65,10 @@ depth: delete list: true - comdev-foundation: + comdev-foundation: # only want projects.json? url: asf/comdev/projects.apache.org/trunk/site/json/foundation - comdevtalks: + comdevtalks: # only used in example.cgi? url: asf/comdev/site/trunk/content/speakers/talks depth: files @@ -142,7 +142,7 @@ url: private/foundation/officers depth: files - officers_historic: + officers_historic: # only need committers.json ? url: private/foundation/officers/historic officers_surveys: @@ -175,6 +175,3 @@ steve: url: asf/steve/trunk - - templates: - url: asf/infrastructure/site/trunk/templates
