[whimsy] 01/02: tweak for running tests

[ru...@apache.org]

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

commit 88d33668b231ad03db4642352885d8cb61a6e401
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Fri Aug 18 12:00:27 2017 -0400

    tweak for running tests
---
 www/board/agenda/routes.rb                 |  2 +-
 www/board/agenda/views/models/events.js.rb | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/board/agenda/routes.rb b/www/board/agenda/routes.rb
index 452c1d2..3ee0e49 100755
--- a/www/board/agenda/routes.rb
+++ b/www/board/agenda/routes.rb
@@ -202,7 +202,7 @@ end
 
 # updates to agenda data
 get %r{/(\d\d\d\d-\d\d-\d\d).json} do |file|
-  file = "board_agenda_#{file.gsub('-','_')}.txt"
+  file = "board_agenda_#{file.gsub('-','_')}.txt".untaint
   pass unless Agenda.parse file, :full
 
   begin
diff --git a/www/board/agenda/views/models/events.js.rb b/www/board/agenda/views/models/events.js.rb
index 9463edd..946bfa1 100644
--- a/www/board/agenda/views/models/events.js.rb
+++ b/www/board/agenda/views/models/events.js.rb
@@ -138,7 +138,7 @@ class Events
 
     def @@socket.onopen(event)
       @@socket.send "session: #{Server.session}\n\n"
-      console.log 'WebSocket connection established'
+      self.log 'WebSocket connection established'
     end
 
     def @@socket.onmessage(event)
@@ -147,17 +147,17 @@ class Events
     end
 
     def @@socket.onerror(event)
-      console.log 'WebSocket connection terminated' if @@socket
+      self.log 'WebSocket connection terminated' if @@socket
       @@socket = nil
     end
 
     def @@socket.onclose(event)
-      console.log 'WebSocket connection terminated' if @@socket
+      self.log 'WebSocket connection terminated' if @@socket
       @@socket = nil
     end
 
   rescue => e
-    console.log e
+    self.log e
   end
 
   # dispatch logic (common to all tabs)
@@ -170,7 +170,7 @@ class Events
       request = Request.new("../session.json", options)
       fetch(request).then do |response|
         response.json().then do |json|
-          console.log json
+          self.log json
           Server.session = json.session
         end
       end

-- 
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.