You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by Sam Ruby <ru...@apache.org> on 2016/03/17 14:53:56 UTC
[whimsy.git] [1/1] Commit b836571: Events => IPC
Commit b836571be5cde7c64e1134d9ee4870d82fdbcbf0:
Events => IPC
Work down the technical debt on board/agenda tests not passing
Branch: refs/heads/master
Author: Sam Ruby <ru...@intertwingly.net>
Committer: Sam Ruby <ru...@intertwingly.net>
Pusher: rubys <ru...@apache.org>
------------------------------------------------------------
lib/whimsy/asf/icla.rb | + -
www/board/agenda/models/ipc.rb | + -
www/board/agenda/spec/actions_spec.rb | ++ --
www/board/agenda/spec/secretary_spec.rb | ++ --
www/board/agenda/views/actions/draft.json.rb | + -
www/board/agenda/views/actions/minute.json.rb | + -
------------------------------------------------------------
16 changes: 8 additions, 8 deletions.
------------------------------------------------------------
diff --git a/lib/whimsy/asf/icla.rb b/lib/whimsy/asf/icla.rb
index 2201e1d..1578dc5 100644
--- a/lib/whimsy/asf/icla.rb
+++ b/lib/whimsy/asf/icla.rb
@@ -10,7 +10,7 @@ class ICLA
@@mtime = nil
- OFFICERS = ASF::SVN['private/foundation/officers']
+ OFFICERS = ASF::SVN.find('private/foundation/officers')
SOURCE = OFFICERS ? "#{OFFICERS}/iclas.txt" : nil
# flush caches if source file changed
diff --git a/www/board/agenda/models/ipc.rb b/www/board/agenda/models/ipc.rb
index 136c785..ecc6f62 100644
--- a/www/board/agenda/models/ipc.rb
+++ b/www/board/agenda/models/ipc.rb
@@ -61,7 +61,7 @@ def self.start_server
if ENV['RACK_ENV'] == 'test'
require_relative 'events'
- IPC = Events = EventService
+ IPC = EventService
elsif ARGV[0] == '--server-only'
diff --git a/www/board/agenda/spec/actions_spec.rb b/www/board/agenda/spec/actions_spec.rb
index a92bce9..4b7feca 100644
--- a/www/board/agenda/spec/actions_spec.rb
+++ b/www/board/agenda/spec/actions_spec.rb
@@ -335,7 +335,7 @@
@reminder = 'reminder1'
response = eval(File.read('views/actions/reminder-text.json.rb'))
expect(response[:subject]).to \
- eq('ASF Board Report - Initial Reminder for February 2015')
+ eq('ASF Board Report for [project] - Initial Reminder for February 2015')
expect(response[:body]).to match(/It is an initial reminder/)
expect(response[:body]).to \
match(/the deadline for\ssubmitting your report is 1 full week/)
@@ -346,7 +346,7 @@
@reminder = 'reminder2'
response = eval(File.read('views/actions/reminder-text.json.rb'))
expect(response[:subject]).to \
- eq('ASF Board Report for February 2015 is now due')
+ eq('ASF Board Report for February 2015 is now due from [project]')
expect(response[:body]).to match(/These reports are\snow due/)
expect(response[:body]).to \
match(/The meeting is scheduled for Wed, 18 Feb 2015 at 10:30 PST\./)
diff --git a/www/board/agenda/spec/secretary_spec.rb b/www/board/agenda/spec/secretary_spec.rb
index dc10ace..30437e8 100644
--- a/www/board/agenda/spec/secretary_spec.rb
+++ b/www/board/agenda/spec/secretary_spec.rb
@@ -89,11 +89,11 @@
@message = 'Draft minutes for 2015-02-18'
@text = draft
+ file = "#{FOUNDATION_BOARD}/board_minutes_2015_02_18.txt"
+
begin
eval(File.read('views/actions/draft.json.rb'))
- file = "#{FOUNDATION_BOARD}/board_minutes_2015_02_18.txt"
-
expect(File.exist? file).to be true
expect(File.read file).to eq draft
ensure
diff --git a/www/board/agenda/views/actions/draft.json.rb b/www/board/agenda/views/actions/draft.json.rb
index 5f50fbc..57fefb5 100644
--- a/www/board/agenda/views/actions/draft.json.rb
+++ b/www/board/agenda/views/actions/draft.json.rb
@@ -30,6 +30,6 @@
drafts = Dir.chdir(FOUNDATION_BOARD) {Dir['board_minutes_*.txt'].sort}
-Events.post type: :server, drafts: drafts
+IPC.post type: :server, drafts: drafts
drafts
diff --git a/www/board/agenda/views/actions/minute.json.rb b/www/board/agenda/views/actions/minute.json.rb
index b404e25..85f4386 100644
--- a/www/board/agenda/views/actions/minute.json.rb
+++ b/www/board/agenda/views/actions/minute.json.rb
@@ -112,6 +112,6 @@
File.write minutes_file, YAML.dump(minutes)
-Events.post type: :minutes, agenda: @agenda, value: minutes
+IPC.post type: :minutes, agenda: @agenda, value: minutes
minutes