From 5d63aea08ef864c3aa42820edfd18b693c60dc71 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@idaemons.org>
Date: Tue, 29 Mar 2016 19:40:10 +0900
Subject: [PATCH] Update expected log in the specs

---
 spec/concerns/dry_runnable_spec.rb         | 6 +++---
 spec/controllers/agents_controller_spec.rb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/concerns/dry_runnable_spec.rb b/spec/concerns/dry_runnable_spec.rb
index 58b392bb..1a937021 100644
--- a/spec/concerns/dry_runnable_spec.rb
+++ b/spec/concerns/dry_runnable_spec.rb
@@ -70,7 +70,7 @@ describe DryRunnable do
       [@agent.memory, counts]
     }
 
-    expect(results[:log]).to match(/\AE, .+ ERROR -- : Exception during dry-run. SandboxedAgent does not support dry-run: /)
+    expect(results[:log]).to match(/\A\[\d\d:\d\d:\d\d\] INFO -- : Dry Run failed\n\[\d\d:\d\d:\d\d\] ERROR -- : Exception during dry-run. SandboxedAgent does not support dry-run: /)
     expect(results[:events]).to eq([])
     expect(results[:memory]).to eq({})
   end
@@ -86,7 +86,7 @@ describe DryRunnable do
         [@agent.memory, counts]
       }
 
-      expect(results[:log]).to match(/\AI, .+ INFO -- : Logging\nE, .+ ERROR -- : Recording error\n/)
+      expect(results[:log]).to match(/\A\[\d\d:\d\d:\d\d\] INFO -- : Dry Run started\n\[\d\d:\d\d:\d\d\] INFO -- : Logging\n\[\d\d:\d\d:\d\d\] ERROR -- : Recording error\n/)
       expect(results[:events]).to eq([{ 'test' => 'foo' }, { 'test' => 'bar' }])
       expect(results[:memory]).to eq({ 'last_status' => 'ok', 'dry_run' => true })
     end
@@ -101,7 +101,7 @@ describe DryRunnable do
         [@agent.memory, counts]
       }
 
-      expect(results[:log]).to match(/\AI, .+ INFO -- : Logging\nE, .+ ERROR -- : Recording error\n/)
+      expect(results[:log]).to match(/\A\[\d\d:\d\d:\d\d\] INFO -- : Dry Run started\n\[\d\d:\d\d:\d\d\] INFO -- : Logging\n\[\d\d:\d\d:\d\d\] ERROR -- : Recording error\n/)
       expect(results[:events]).to eq([{ 'test' => 'superfoo' }, { 'test' => 'superbar' }])
       expect(results[:memory]).to eq({ 'last_status' => 'ok', 'dry_run' => true })
     end
diff --git a/spec/controllers/agents_controller_spec.rb b/spec/controllers/agents_controller_spec.rb
index f1485e77..cd4c65d8 100644
--- a/spec/controllers/agents_controller_spec.rb
+++ b/spec/controllers/agents_controller_spec.rb
@@ -406,7 +406,7 @@ describe AgentsController do
         [users(:bob).agents.count, users(:bob).events.count, users(:bob).logs.count, agent.name, agent.updated_at]
       }
       json = JSON.parse(response.body)
-      expect(json['log']).to match(/^I, .* : Fetching #{Regexp.quote(url_from_event)}$/)
+      expect(json['log']).to match(/^\[\d\d:\d\d:\d\d\] INFO -- : Fetching #{Regexp.quote(url_from_event)}$/)
     end
   end