shipit-engine 0.35.1 → 0.37.0

data/test/fixtures/shipit/stacks.yml

@@ -97,8 +97,8 @@ shipit:
         ]
       }
     }
-  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
-  updated_at: <%= 8.days.ago.to_s(:db) %>
+  last_deployed_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
 shipit_canaries:
   repository: shipit
@@ -156,8 +156,8 @@ shipit_canaries:
         "allow_failures": ["ci/ok_to_fail"]
       }
     }
-  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
-  updated_at: <%= 8.days.ago.to_s(:db) %>
+  last_deployed_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
 cyclimse:
   repository: cyclimse
@@ -189,8 +189,8 @@ cyclimse:
         }
       }
     }
-  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
-  updated_at: <%= 8.days.ago.to_s(:db) %>
+  last_deployed_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
 undeployed_stack:
   repository: foo-bar
@@ -226,7 +226,7 @@ undeployed_stack:
         "allow_failures": ["ci/ok_to_fail"]
       }
     }
-  updated_at: <%= 8.days.ago.to_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
 soc:
   repository: soc
@@ -260,7 +260,7 @@ soc:
         "blocking": ["soc/compliance"]
       }
     }
-  updated_at: <%= 8.days.ago.to_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
 check_runs:
   repository: check_runs
@@ -337,8 +337,8 @@ shipit_undeployed:
         "allow_failures": ["ci/ok_to_fail"]
       }
     }
-  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
-  updated_at: <%= 8.days.ago.to_s(:db) %>
+  last_deployed_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
 shipit_single:
   repository: shipit
@@ -374,8 +374,8 @@ shipit_single:
         "blocking": ["soc/compliance"]
       }
     }
-  updated_at: <%= 8.days.ago.to_s(:db) %>
-  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  last_deployed_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
 shipit_stats:
   repository: shipit
@@ -411,8 +411,8 @@ shipit_stats:
         "blocking": ["soc/compliance"]
       }
     }
-  updated_at: <%= 8.days.ago.to_s(:db) %>
-  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  last_deployed_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
 shipit_task_no_commits:
   repository: shipit
@@ -466,7 +466,7 @@ shipit_task_no_commits:
         "allow_failures": ["ci/ok_to_fail"]
       }
     }
-  updated_at: <%= 8.days.ago.to_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
 check_deploy_spec:
   repository: check_deploy_spec
@@ -478,8 +478,8 @@ check_deploy_spec:
   undeployed_commits_count: 1
   continuous_deployment: true
   cached_deploy_spec: "{}"
-  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
-  updated_at: <%= 8.days.ago.to_s(:db) %>
+  last_deployed_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
 review_stack:
   type: Shipit::ReviewStack
@@ -581,8 +581,8 @@ review_stack:
         ]
       }
     }
-  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
-  updated_at: <%= 8.days.ago.to_s(:db) %>
+  last_deployed_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
 archived_25hours_ago:
   type: Shipit::ReviewStack
@@ -594,9 +594,9 @@ archived_25hours_ago:
   tasks_count: 8
   undeployed_commits_count: 2
   cached_deploy_spec: "{}"
-  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
-  updated_at: <%= 8.days.ago.to_s(:db) %>
-  archived_since: <%= 25.hours.ago.to_s(:db) %>
+  last_deployed_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  archived_since: <%= 25.hours.ago.to_formatted_s(:db) %>
 
 archived_6hours_ago:
   type: Shipit::ReviewStack
@@ -608,9 +608,9 @@ archived_6hours_ago:
   tasks_count: 8
   undeployed_commits_count: 2
   cached_deploy_spec: "{}"
-  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
-  updated_at: <%= 8.days.ago.to_s(:db) %>
-  archived_since: <%= 6.hours.ago.to_s(:db) %>
+  last_deployed_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  archived_since: <%= 6.hours.ago.to_formatted_s(:db) %>
 
 archived_30minutes_ago:
   type: Shipit::ReviewStack
@@ -622,6 +622,6 @@ archived_30minutes_ago:
   tasks_count: 8
   undeployed_commits_count: 2
   cached_deploy_spec: "{}"
-  last_deployed_at: <%= 8.days.ago.to_s(:db) %>
-  updated_at: <%= 8.days.ago.to_s(:db) %>
-  archived_since: <%= 30.minutes.ago.to_s(:db) %>
+  last_deployed_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
+  archived_since: <%= 30.minutes.ago.to_formatted_s(:db) %>

data/test/fixtures/shipit/statuses.yml

@@ -5,7 +5,7 @@ first_pending:
   commit_id: 1 # first
   description: lets go
   context: ci/travis
-  created_at: <%= 10.days.ago.to_s(:db) %>
+  created_at: <%= 10.days.ago.to_formatted_s(:db) %>
   state: pending
   target_url: "http://www.example.com"
 
@@ -14,7 +14,7 @@ second_pending_travis:
   commit_id: 2 # second
   description: lets go
   context: ci/travis
-  created_at: <%= 10.days.ago.to_s(:db) %>
+  created_at: <%= 10.days.ago.to_formatted_s(:db) %>
   state: pending
   target_url: "http://www.example.com"
 
@@ -23,7 +23,7 @@ second_pending_coveralls:
   commit_id: 2 # second
   description: lets go
   context: metrics/coveralls
-  created_at: <%= 10.days.ago.to_s(:db) %>
+  created_at: <%= 10.days.ago.to_formatted_s(:db) %>
   state: pending
   target_url: "http://www.example.com"
 
@@ -32,7 +32,7 @@ second_success_travis:
   commit_id: 2 # second
   description: lets go
   context: ci/travis
-  created_at: <%= 9.days.ago.to_s(:db) %>
+  created_at: <%= 9.days.ago.to_formatted_s(:db) %>
   state: success
   target_url: "http://www.example.com"
 
@@ -41,7 +41,7 @@ second_failure_coveralls:
   commit_id: 2 # second
   description: lets go
   context: metrics/coveralls
-  created_at: <%= 9.days.ago.to_s(:db) %>
+  created_at: <%= 9.days.ago.to_formatted_s(:db) %>
   state: failure
   target_url: "http://www.example.com"
 
@@ -50,7 +50,7 @@ third_success_travis:
   commit_id: 3 # third
   description: lets go
   context: ci/travis
-  created_at: <%= 9.days.ago.to_s(:db) %>
+  created_at: <%= 9.days.ago.to_formatted_s(:db) %>
   state: success
   target_url: "http://www.example.com"
 
@@ -59,7 +59,7 @@ third_success_coveralls:
   commit_id: 3 # third
   description: lets go
   context: metrics/coveralls
-  created_at: <%= 9.days.ago.to_s(:db) %>
+  created_at: <%= 9.days.ago.to_formatted_s(:db) %>
   state: success
   target_url: "http://www.example.com"
 
@@ -68,7 +68,7 @@ fourth_pending_travis:
   commit_id: 4 # fourth
   description: lets go
   context: ci/travis
-  created_at: <%= 9.days.ago.to_s(:db) %>
+  created_at: <%= 9.days.ago.to_formatted_s(:db) %>
   state: pending
   target_url: "http://www.example.com"
 
@@ -77,7 +77,7 @@ fourth_success_coveralls:
   commit_id: 4 # fourth
   description: lets go
   context: metrics/coveralls
-  created_at: <%= 9.days.ago.to_s(:db) %>
+  created_at: <%= 9.days.ago.to_formatted_s(:db) %>
   state: success
   target_url: "http://www.example.com"
 
@@ -86,7 +86,7 @@ cyclimse_success_travis:
   commit_id: 6 # cyclimse_first
   description: lets go
   context: ci/travis
-  created_at: <%= 9.days.ago.to_s(:db) %>
+  created_at: <%= 9.days.ago.to_formatted_s(:db) %>
   state: success
   target_url: "http://www.example.com"
 
@@ -95,7 +95,7 @@ shipit_pending_pr_success_travis:
   commit_id: 8 # shipit_pending_pr_head
   description: Super feature
   context: ci/travis
-  created_at: <%= 9.days.ago.to_s(:db) %>
+  created_at: <%= 9.days.ago.to_formatted_s(:db) %>
   state: success
   target_url: "http://www.example.com"
 
@@ -104,7 +104,7 @@ soc_first:
   commit_id: 101 # soc_first
   description: Woops
   context: soc/compliance
-  created_at: <%= 9.days.ago.to_s(:db) %>
+  created_at: <%= 9.days.ago.to_formatted_s(:db) %>
   state: failure
   target_url: "http://www.example.com"
 
@@ -113,7 +113,7 @@ soc_second:
   commit_id: 102 # soc_second
   description: All good
   context: soc/compliance
-  created_at: <%= 7.days.ago.to_s(:db) %>
+  created_at: <%= 7.days.ago.to_formatted_s(:db) %>
   state: success
   target_url: "http://www.example.com"
 
@@ -122,7 +122,7 @@ soc_third:
   commit_id: 103 # soc_third
   description: All good
   context: soc/compliance
-  created_at: <%= 7.days.ago.to_s(:db) %>
+  created_at: <%= 7.days.ago.to_formatted_s(:db) %>
   state: success
   target_url: "http://www.example.com"
 
@@ -131,7 +131,7 @@ canaries_fifth_success:
   commit_id: 305
   description: All good
   context: ci/travis
-  created_at: <%= 7.days.ago.to_s(:db) %>
+  created_at: <%= 7.days.ago.to_formatted_s(:db) %>
   state: success
   target_url: "http://www.example.com"
 
@@ -140,6 +140,6 @@ review_stack_commit_success:
   commit_id: 801
   description: lets go
   context: ci/travis
-  created_at: <%= 10.days.ago.to_s(:db) %>
+  created_at: <%= 10.days.ago.to_formatted_s(:db) %>
   state: success
   target_url: "http://www.example.com"

data/test/fixtures/shipit/tasks.yml

@@ -8,9 +8,9 @@ shipit:
   status: success
   additions: 1
   deletions: 1
-  created_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 6).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 1).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 1).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 6).minutes.ago.to_formatted_s(:db) %>
   max_retries: 3
 
 shipit2:
@@ -23,9 +23,9 @@ shipit2:
   status: failed
   additions: 12
   deletions: 64
-  created_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 2).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 2).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 4).minutes.ago.to_formatted_s(:db) %>
 
 shipit_restart:
   id: 3
@@ -46,9 +46,9 @@ shipit_restart:
         "cap $ENVIRONMENT deploy:restart"
       ]
     }
-  created_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 3).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 3).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 4).minutes.ago.to_formatted_s(:db) %>
 
 shipit_pending:
   id: 4
@@ -59,7 +59,7 @@ shipit_pending:
   status: pending
   additions: 432
   deletions: 406
-  created_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 4).minutes.ago.to_formatted_s(:db) %>
   allow_concurrency: true
   max_retries: 1
   retry_attempt: 0
@@ -74,8 +74,8 @@ shipit_running:
   status: running
   additions: 420
   deletions: 342
-  created_at: <%= (60 - 5).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 5).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 5).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 5).minutes.ago.to_formatted_s(:db) %>
   allow_concurrency: true
 
 shipit_complete:
@@ -88,9 +88,9 @@ shipit_complete:
   status: success
   additions: 420
   deletions: 342
-  created_at: <%= (60 - 6).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 6).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 8).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 6).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 6).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 8).minutes.ago.to_formatted_s(:db) %>
 
 shipit_aborted:
   id: 7
@@ -103,9 +103,9 @@ shipit_aborted:
   additions: 420
   deletions: 342
   rollback_once_aborted: true
-  created_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 6).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 7).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 7).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 6).minutes.ago.to_formatted_s(:db) %>
 
 shipit_rollback:
   id: 8
@@ -118,9 +118,9 @@ shipit_rollback:
   status: aborted
   additions: 420
   deletions: 342
-  created_at: <%= (60 - 8).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 8).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 8).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 8).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 7).minutes.ago.to_formatted_s(:db) %>
 
 soc_deploy:
   id: 9
@@ -132,9 +132,9 @@ soc_deploy:
   status: success
   additions: 1
   deletions: 1
-  created_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 1).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 1).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 3).minutes.ago.to_formatted_s(:db) %>
 
 shipit_rendered_failover:
   id: 10
@@ -159,9 +159,9 @@ shipit_rendered_failover:
     }
   env:
     POD_ID: "12"
-  created_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 3).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 3).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 4).minutes.ago.to_formatted_s(:db) %>
 
 canaries_success:
   id: 101
@@ -171,9 +171,9 @@ canaries_success:
   until_commit_id: 302
   type: Shipit::Deploy
   status: success
-  created_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 1).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 1).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 3).minutes.ago.to_formatted_s(:db) %>
 
 canaries_faulty:
   id: 102
@@ -183,9 +183,9 @@ canaries_faulty:
   until_commit_id: 303
   type: Shipit::Deploy
   status: faulty
-  created_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 4).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 4).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 7).minutes.ago.to_formatted_s(:db) %>
 
 canaries_validating:
   id: 103
@@ -195,9 +195,9 @@ canaries_validating:
   until_commit_id: 304
   type: Shipit::Deploy
   status: validating
-  created_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 10).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 7).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 7).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 10).minutes.ago.to_formatted_s(:db) %>
 
 canaries_running:
   id: 104
@@ -207,9 +207,9 @@ canaries_running:
   until_commit_id: 305
   type: Shipit::Deploy
   status: running
-  created_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 7).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 10).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 7).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 7).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 10).minutes.ago.to_formatted_s(:db) %>
 
 shipit_with_title_parsing_issue:
   id: 105
@@ -234,9 +234,9 @@ shipit_with_title_parsing_issue:
     }
   env:
     POD_ID: "12"
-  created_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 3).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 3).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 4).minutes.ago.to_formatted_s(:db) %>
 
 shipit_undeployed_1:
   id: 201
@@ -248,9 +248,9 @@ shipit_undeployed_1:
   status: success
   additions: 1
   deletions: 1
-  created_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 1).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 3).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 1).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 1).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 3).minutes.ago.to_formatted_s(:db) %>
 
 shipit_undeployed_2:
   id: 202
@@ -262,9 +262,9 @@ shipit_undeployed_2:
   status: running
   additions: 12
   deletions: 64
-  created_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 2).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 2).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 4).minutes.ago.to_formatted_s(:db) %>
 
 shipit_single:
   id: 301
@@ -276,9 +276,9 @@ shipit_single:
   status: running
   additions: 12
   deletions: 64
-  created_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 2).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 2).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 4).minutes.ago.to_formatted_s(:db) %>
 
 shipit_stats:
   id: 401
@@ -290,9 +290,9 @@ shipit_stats:
   status: success
   additions: 12
   deletions: 64
-  created_at: <%= 60.minutes.ago.to_s(:db) %>
-  started_at: <%= 60.minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 4).minutes.ago.to_s(:db) %>
+  created_at: <%= 60.minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= 60.minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 4).minutes.ago.to_formatted_s(:db) %>
 
 shipit_stats_2:
   id: 402
@@ -304,9 +304,9 @@ shipit_stats_2:
   status: failed
   additions: 12
   deletions: 64
-  created_at: <%= (60 - 5).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 5).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 11).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 5).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 5).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 11).minutes.ago.to_formatted_s(:db) %>
 
 shipit_stats_3:
   id: 403
@@ -318,9 +318,9 @@ shipit_stats_3:
   status: success
   additions: 12
   deletions: 64
-  created_at: <%= (60 - 10).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 12).minutes.ago.to_s(:db) %>
-  ended_at: <%= (60 - 15).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 10).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 12).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (60 - 15).minutes.ago.to_formatted_s(:db) %>
 
 shipit_stats_4:
   id: 404
@@ -332,9 +332,9 @@ shipit_stats_4:
   status: success
   additions: 12
   deletions: 64
-  created_at: <%= (30 - 15).minutes.ago.to_s(:db) %>
-  started_at: <%= (30 - 15).minutes.ago.to_s(:db) %>
-  ended_at: <%= (30 - 17).minutes.ago.to_s(:db) %>
+  created_at: <%= (30 - 15).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (30 - 15).minutes.ago.to_formatted_s(:db) %>
+  ended_at: <%= (30 - 17).minutes.ago.to_formatted_s(:db) %>
 
 shipit_nocommit_task:
   id: 501
@@ -342,5 +342,17 @@ shipit_nocommit_task:
   type: Shipit::Task
   stack: shipit_task_no_commits
   status: pending
-  created_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
-  started_at: <%= (60 - 2).minutes.ago.to_s(:db) %>
+  created_at: <%= (60 - 2).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 2).minutes.ago.to_formatted_s(:db) %>
+
+shipit_legacy_yaml_task:
+  id: 502
+  user: walrus
+  type: Shipit::Task
+  stack: shipit_task_no_commits
+  status: pending
+  created_at: <%= (60 - 1).minutes.ago.to_formatted_s(:db) %>
+  started_at: <%= (60 - 1).minutes.ago.to_formatted_s(:db) %>
+  env: |
+    --- !ruby/hash:ActiveSupport::HashWithIndifferentAccess
+    POD_ID: '12'

data/test/fixtures/shipit/users.yml

@@ -2,15 +2,13 @@ walrus:
   name:  Lando Walrussian
   email: walrus@shopify.com
   login: walrus
-  encrypted_github_access_token: "ffHk4diyVKppJGfwfJefMizxF45H\n" # t0k3n
-  encrypted_github_access_token_iv: "gRSldoTZ+fmrIDoY\n"
+  encrypted_github_access_token: '{"p":"Ak5D+/jUFz3e","h":{"iv":"dwwXJyB7F7fWqviI","at":"NQ4U3zu9ijCrZ/iGmZBQtg=="}}' # ghu_t0k3n
 
 codertocat:
   name: Coding Cat
   email: coding@cat.com
   login: Codertocat
-  encrypted_github_access_token: "ffHk4diyVKppJGfwfJefMizxF45H\n" # t0k3n
-  encrypted_github_access_token_iv: "gRSldoTZ+fmrIDoY\n"
+  encrypted_github_access_token: '{"p":"Ak5D+/jUFz3e","h":{"iv":"dwwXJyB7F7fWqviI","at":"NQ4U3zu9ijCrZ/iGmZBQtg=="}}' # ghu_t0k3n
 
 bob:
   name:  Bob the Builder
@@ -33,4 +31,3 @@ legacy:
   email: legacy@shopify.com
   login: legacy
   encrypted_github_access_token: FuQv9jpHmMZ8Px64xmqASJtKlefv # t0k3n
-  encrypted_github_access_token_iv: "QNS4smChXEXtOjxb\n"

data/test/models/commits_test.rb

@@ -618,7 +618,7 @@ module Shipit
           unless initial_state == 'unknown'
             attrs = initial_status_attributes.merge(
               stack_id: commit.stack_id,
-              created_at: 10.days.ago.to_s(:db),
+              created_at: 10.days.ago.to_formatted_s(:db),
             )
             commit.statuses.create!(attrs)
           end
@@ -626,7 +626,7 @@ module Shipit
 
           expected_status_attributes = { state: new_state, description: initial_state, context: 'ci/travis' }
           add_status = lambda do
-            attrs = expected_status_attributes.merge(created_at: 1.day.ago.to_s(:db))
+            attrs = expected_status_attributes.merge(created_at: 1.day.ago.to_formatted_s(:db))
             commit.create_status_from_github!(OpenStruct.new(attrs))
           end
           expect_hook_emit(commit, :commit_status, expected_status_attributes) do
@@ -651,7 +651,7 @@ module Shipit
           state: 'failure',
           description: 'Sad',
           context: 'ci/hidden',
-          created_at: 1.day.ago.to_s(:db),
+          created_at: 1.day.ago.to_formatted_s(:db),
         )
         commit.create_status_from_github!(github_status)
       end
@@ -668,7 +668,7 @@ module Shipit
           state: 'failure',
           description: 'Sad',
           context: 'ci/ok_to_fail',
-          created_at: 1.day.ago.to_s(:db),
+          created_at: 1.day.ago.to_formatted_s(:db),
         )
         commit.create_status_from_github!(github_status)
       end
@@ -683,7 +683,7 @@ module Shipit
           state: 'failure',
           description: 'Sad',
           context: 'ci/travis',
-          created_at: 1.day.ago.to_s(:db),
+          created_at: 1.day.ago.to_formatted_s(:db),
         )
         commit.create_status_from_github!(github_status)
       end
@@ -695,7 +695,7 @@ module Shipit
         state: 'success',
         description: 'Cool',
         context: 'metrics/coveralls',
-        created_at: 1.day.ago.to_s(:db),
+        created_at: 1.day.ago.to_formatted_s(:db),
       )
 
       assert_equal 'failure', commit.state

data/test/models/deploy_spec_test.rb

@@ -286,29 +286,6 @@ module Shipit
       assert_equal({ 'GLOBAL' => '1' }, @spec.machine_env)
     end
 
-    test '#load_config can grab the env-specific shipit.yml file' do
-      config = {}
-      config.expects(:exist?).returns(true)
-      config.expects(:read).returns({ 'dependencies' => { 'override' => %w(foo bar baz) } }.to_yaml)
-      spec = DeploySpec::FileSystem.new('.', 'staging')
-      spec.expects(:file).with('shipit.staging.yml', root: true).returns(config)
-      assert_equal %w(foo bar baz), spec.dependencies_steps
-    end
-
-    test '#load_config grabs the global shipit.yml file if there is no env-specific file' do
-      not_config = {}
-      not_config.expects(:exist?).returns(false)
-
-      config = {}
-      config.expects(:exist?).returns(true)
-      config.expects(:read).returns({ 'dependencies' => { 'override' => %w(foo bar baz) } }.to_yaml)
-
-      spec = DeploySpec::FileSystem.new('.', 'staging')
-      spec.expects(:file).with('shipit.staging.yml', root: true).returns(not_config)
-      spec.expects(:file).with('shipit.yml', root: true).returns(config)
-      assert_equal %w(foo bar baz), spec.dependencies_steps
-    end
-
     test '#gemspec gives the path of the repo gemspec if present' do
       spec = DeploySpec::FileSystem.new('foobar/', 'production')
       Dir.expects(:[]).with('foobar/*.gemspec').returns(['foobar/foobar.gemspec'])