Fixed tests and time serialization.

lbeder · Mar 6, 2017 · 517828b · 517828b
1 parent 9504b7b
commit 517828b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/lib/health_monitor/monitor.rb b/lib/health_monitor/monitor.rb
@@ -22,7 +22,7 @@ def check(request: nil)
     {
       results: results,
       status: results.all? { |res| res[:status] == STATUSES[:ok] } ? :ok : :service_unavailable,
-      timestamp: Time.now
+      timestamp: Time.now.to_s(:rfc2822)
     }
   end
 

diff --git a/lib/health_monitor/providers/redis.rb b/lib/health_monitor/providers/redis.rb
@@ -6,7 +6,7 @@ class RedisException < StandardError; end
 
     class Redis < Base
       def check!
-        time = Time.now.to_s(:db)
+        time = Time.now.to_s(:rfc2822)
 
         redis = ::Redis.new
         redis.set(key, time)

diff --git a/spec/controllers/health_monitor/health_controller_spec.rb b/spec/controllers/health_monitor/health_controller_spec.rb
@@ -47,7 +47,7 @@
             }
           ],
           'status' => 'ok',
-          'timestamp' => '1990-01-01T00:00:00.000+01:00'
+          'timestamp' => time.to_s(:rfc2822)
         )
       end
     end
@@ -95,7 +95,7 @@
             }
           ],
           'status' => 'ok',
-          'timestamp' => '1990-01-01T00:00:00.000+01:00',
+          'timestamp' => time.to_s(:rfc2822),
           'environment_variables' => {
             'build_number' => '12',
             'git_sha' => 'example_sha'
@@ -128,7 +128,7 @@
           }
         ],
         'status' => 'ok',
-        'timestamp' => '1990-01-01T00:00:00.000+01:00'
+        'timestamp' => time.to_s(:rfc2822)
       )
     end
 
@@ -152,7 +152,7 @@
             }
           ],
           'status' => 'service_unavailable',
-          'timestamp' => '1990-01-01T00:00:00.000+01:00'
+          'timestamp' => time.to_s(:rfc2822)
         )
       end
     end

diff --git a/spec/lib/health_monitor/monitor_spec.rb b/spec/lib/health_monitor/monitor_spec.rb
@@ -83,7 +83,7 @@
             }
           ],
           :status => :ok,
-          :timestamp => time
+          :timestamp => time.to_s(:rfc2822)
         )
       end
     end
@@ -111,7 +111,7 @@
             }
           ],
           :status => :ok,
-          :timestamp => time
+          :timestamp => time.to_s(:rfc2822)
         )
       end
 
@@ -130,12 +130,12 @@
               },
               {
                 name: 'Redis',
-                message: "different values (now: #{time.to_s(:db)}, fetched: false)",
+                message: "different values (now: #{time}, fetched: false)",
                 status: 'ERROR'
               }
             ],
             :status => :service_unavailable,
-            :timestamp => time
+            :timestamp => time.to_s(:rfc2822)
           )
         end
       end
@@ -160,7 +160,7 @@
               }
             ],
             :status => :ok,
-            :timestamp => time
+            :timestamp => time.to_s(:rfc2822)
           )
         end
       end
@@ -181,12 +181,12 @@
               },
               {
                 name: 'Redis',
-                message: "different values (now: #{time.to_s(:db)}, fetched: false)",
+                message: "different values (now: #{time}, fetched: false)",
                 status: 'ERROR'
               }
             ],
             :status => :service_unavailable,
-            :timestamp => time
+            :timestamp => time.to_s(:rfc2822)
           )
         end
       end
@@ -224,7 +224,7 @@
             }
           ],
           :status => :service_unavailable,
-          :timestamp => time
+          :timestamp => time.to_s(:rfc2822)
         )
 
         expect(test).to be_truthy