shipit-engine 0.38.0 → 0.40.0

data/test/controllers/webhooks_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -24,7 +25,7 @@ module Shipit
 
       body = JSON.parse(payload(:push_master)).to_json
       assert_enqueued_with(job: GithubSyncJob, args: [stack_id: @stack.id]) do
-        post :create, body: body, as: :json
+        post :create, body:, as: :json
       end
     end
 
@@ -43,7 +44,7 @@ module Shipit
 
       body = JSON.parse(payload(:status_master)).merge(repository_params).to_json
       assert_difference 'commit.statuses.count', 1 do
-        post :create, body: body, as: :json
+        post :create, body:, as: :json
       end
 
       status = commit.statuses.last
@@ -74,7 +75,7 @@ module Shipit
 
       body = JSON.parse(payload(:check_suite_master)).to_json
       assert_enqueued_with(job: RefreshCheckRunsJob) do
-        post :create, body: body, as: :json
+        post :create, body:, as: :json
         assert_response :ok
       end
     end
@@ -107,11 +108,11 @@ module Shipit
       @request.headers['X-Github-Event'] = 'membership'
       assert_difference -> { Team.count }, 1 do
         post :create, as: :json, body: membership_params.merge(team: {
-          id: 48,
-          name: 'Ouiche Cooks',
-          slug: 'ouiche-cooks',
-          url: 'https://example.com',
-        }).to_json
+                                                                 id: 48,
+                                                                 name: 'Ouiche Cooks',
+                                                                 slug: 'ouiche-cooks',
+                                                                 url: 'https://example.com'
+                                                               }).to_json
         assert_response :ok
       end
     end
@@ -201,7 +202,7 @@ module Shipit
         login: 'george',
         email: 'george@cyclim.se',
         avatar_url: 'https://avatars.githubusercontent.com/u/42?v=3',
-        url: 'https://api.github.com/user/george',
+        url: 'https://api.github.com/user/george'
       )
     end
   end

data/test/dummy/config/application.rb

@@ -17,6 +17,7 @@ end
 
 module Shipit
   class Application < Rails::Application
-    config.load_defaults 7.0
+    config.load_defaults 8.0
+    config.active_record.encryption.support_sha1_for_non_deterministic_encryption = true
   end
 end

data/test/dummy/config/initializers/0_load_development_secrets.rb

@@ -2,8 +2,8 @@ local_secrets = Shipit::Engine.root.join('config/secrets.development.yml')
 if local_secrets.exist?
   secrets = YAML.load(local_secrets.read).deep_symbolize_keys
   if Rails.env.development?
-    Rails.application.secrets.deep_merge!(secrets)
+    Rails.application.credentials.deep_merge!(secrets)
   elsif Rails.env.test?
-    Rails.application.secrets.merge!(redis_url: secrets[:redis_url])
+    Rails.application.credentials.merge!(redis_url: secrets[:redis_url])
   end
 end

data/test/dummy/config/secrets.development.json

@@ -0,0 +1,3 @@
+{
+  "secret_key_base": "s3cr3ts3cr3ts3cr3ts3cr3ts3cr3ts3cr3t"
+}

data/test/dummy/config/secrets.test.json

@@ -0,0 +1,21 @@
+{
+  "host": "shipit.com",
+  "secret_key_base": "s3cr3ts3cr3ts3cr3ts3cr3ts3cr3ts3cr3t",
+  "github_api": {
+    "token": "t0k3n"
+  },
+  "github": {
+    "domain": null,
+    "app_id": 42,
+    "installation_id": 43,
+    "bot_login": "shipit[bot]",
+    "webhook_secret": null,
+    "private_key": "-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEA7iUQC2uUq/gtQg0gxtyaccuicYgmq1LUr1mOWbmwM1Cv63+S\n73qo8h87FX+YyclY5fZF6SMXIys02JOkImGgbnvEOLcHnImCYrWs03msOzEIO/pG\nM0YedAPtQ2MEiLIu4y8htosVxeqfEOPiq9kQgFxNKyETzjdIA9q1md8sofuJUmPv\nibacW1PecuAMnn+P8qf0XIDp7uh6noB751KvhCaCNTAPtVE9NZ18OmNG9GOyX/pu\npQHIrPgTpTG6KlAe3r6LWvemzwsMtuRGU+K+KhK9dFIlSE+v9rA32KScO8efOh6s\nGu3rWorV4iDu14U62rzEfdzzc63YL94sUbZxbwIDAQABAoIBADLJ8r8MxZtbhYN1\nu0zOFZ45WL6v09dsBfITvnlCUeLPzYUDIzoxxcBFittN6C744x3ARS6wjimw+EdM\nTZALlCSb/sA9wMDQzt7wchhz9Zh2H5RzDu+2f54sjDh38KqancdT8PO2fAFGxX/b\nqicOVyeZB9gv6MJtJc20olBbuXAeBNfcDABF9oxF+0i+Ssg7B4VXiqgcjtGbr/Og\nqRll7AqyTArVx2xEcVfZxeZ4zGnigzcJq4te7yYpxzwk+RxblkPh54Yt4WxZ+8DI\nRsn3r6ajlpwzpwvsJFU2Txq7xBTzGQMFmy/Pnjk83kP2cogxB2+tRyjITGqTwD8b\ngg9PFCkCgYEA+7u8A0l0Cz6p0SI6c7ftVePVRiIhpawWN7og/wEmI6zUjm/3rA+R\nhrhaVKuOD8QF/HdDsqTck5gjGAjTmJz6r33/cl1Tz+pr62znsrB4r0yMKvQbKN81\nWGaWOsi2+ZXqLNv5h5wpUF0MTKlXHeKnwP5kuEvGwVn6WURFCh6PhLMCgYEA8i5e\nJjulJVGyd5HuoY3xyO7E6DjidsqRnVRq+hYpORjnHvTmSwe4+tH4ha2p9Kv2Y6k3\nC1NYY/fSMQoYCCRaYyJleI+la/9tsZqAmtms4ZB8KhFmPHf9fW75i6G0xKWyZ8K+\nE2Ft/UaEiM282593cguV6+Kt5uExnyPxLLK4FlUCgYEAwRJ/JGI8/7bjFkTTYheq\nj5q75BufhOrU6471acAe2XPgXxLfefdC3Xodxh0CS3NESBvNL4Ikr4sbN37lk4Kq\n/th7iOKtuqUIeru/hZy2I3VpeDRbdGCmEJQ2GwYA2LKztg5Nd0Y9paaIHXAwIfrK\nQUqcQ4HTAk8ZpUeoUBeaaeMCgYANLmbjb9WiPVsYVPIHCwHA7PX8qbPxwT7BsGmO\nKQyfVfKmZa/vH4F67Vi4deZNMdrcO8aKMEQcVM2065a5QrlEsgeR00eupB1lUEJ1\nqylUsZeAdqf43JMIc7TTW77KATa/nQLZbTEeWus1wvTngztuEqFbUGAks9cOkVc8\nFpIcbQKBgQDVIL8gPLmn0f+4oLF8MBC+oxtKpz14X5iJ1saGFkzW5I+nIEskpS0S\nqtirnTCnJFGdCrFwctnxiuiCmyGwpBYdjIfHyvYAHnqAtMnESzCUyeSFZiquVW5W\nMvbMmDPoV27XOHU9kIq6NXtfrkpufiyo6/VEYWozXalxKLNuqLYfPQ==\n-----END RSA PRIVATE KEY-----\n",
+    "oauth": {
+      "id": "Iv1.bf2c2c45b449bfd9",
+      "secret": "ef694cd6e45223075d78d138ef014049052665f1",
+      "teams": null
+    }
+  },
+  "redis_url": "redis://127.0.0.1:6379/7"
+}

data/test/dummy/db/schema.rb

@@ -10,8 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_07_03_181143) do
-
+ActiveRecord::Schema[7.2].define(version: 2025_02_07_203053) do
   create_table "api_clients", force: :cascade do |t|
     t.text "permissions", limit: 65535
     t.integer "creator_id", limit: 4
@@ -52,7 +51,7 @@ ActiveRecord::Schema.define(version: 2023_07_03_181143) do
   create_table "commit_deployments", force: :cascade do |t|
     t.integer "commit_id"
     t.integer "task_id"
-    t.integer "github_id"
+    t.bigint "github_id"
     t.string "api_url"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
@@ -87,6 +86,34 @@ ActiveRecord::Schema.define(version: 2023_07_03_181143) do
     t.index ["stack_id"], name: "index_commits_on_stack_id"
   end
 
+  create_table "continuous_delivery_schedules", force: :cascade do |t|
+    t.integer "stack_id", null: false
+    t.boolean "sunday_enabled", default: true, null: false
+    t.time "sunday_start", default: "2000-01-01 00:00:00", null: false
+    t.time "sunday_end", default: "2000-01-01 23:59:00", null: false
+    t.boolean "monday_enabled", default: true, null: false
+    t.time "monday_start", default: "2000-01-01 00:00:00", null: false
+    t.time "monday_end", default: "2000-01-01 23:59:00", null: false
+    t.boolean "tuesday_enabled", default: true, null: false
+    t.time "tuesday_start", default: "2000-01-01 00:00:00", null: false
+    t.time "tuesday_end", default: "2000-01-01 23:59:00", null: false
+    t.boolean "wednesday_enabled", default: true, null: false
+    t.time "wednesday_start", default: "2000-01-01 00:00:00", null: false
+    t.time "wednesday_end", default: "2000-01-01 23:59:00", null: false
+    t.boolean "thursday_enabled", default: true, null: false
+    t.time "thursday_start", default: "2000-01-01 00:00:00", null: false
+    t.time "thursday_end", default: "2000-01-01 23:59:00", null: false
+    t.boolean "friday_enabled", default: true, null: false
+    t.time "friday_start", default: "2000-01-01 00:00:00", null: false
+    t.time "friday_end", default: "2000-01-01 23:59:00", null: false
+    t.boolean "saturday_enabled", default: true, null: false
+    t.time "saturday_start", default: "2000-01-01 00:00:00", null: false
+    t.time "saturday_end", default: "2000-01-01 23:59:00", null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["stack_id"], name: "index_continuous_delivery_schedules_on_stack_id", unique: true
+  end
+
   create_table "deliveries", force: :cascade do |t|
     t.integer "hook_id", limit: 4, null: false
     t.string "status", limit: 50, default: "pending", null: false
@@ -106,7 +133,7 @@ ActiveRecord::Schema.define(version: 2023_07_03_181143) do
 
   create_table "github_hooks", force: :cascade do |t|
     t.integer "stack_id", limit: 4
-    t.integer "github_id", limit: 4
+    t.bigint "github_id"
     t.string "event", limit: 50, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -313,7 +340,7 @@ ActiveRecord::Schema.define(version: 2023_07_03_181143) do
   end
 
   create_table "teams", force: :cascade do |t|
-    t.integer "github_id", limit: 4
+    t.bigint "github_id"
     t.string "api_url", limit: 255
     t.string "slug", limit: 255
     t.string "name", limit: 255
@@ -324,7 +351,7 @@ ActiveRecord::Schema.define(version: 2023_07_03_181143) do
   end
 
   create_table "users", force: :cascade do |t|
-    t.integer "github_id", limit: 4
+    t.bigint "github_id"
     t.string "name", limit: 255, null: false
     t.string "email", limit: 255
     t.string "login", limit: 39

data/test/fixtures/shipit/commits.yml

@@ -258,7 +258,7 @@ canaries_fifth:
   updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
   created_at: <%= 1.day.ago.to_formatted_s(:db) %>
 
-undeployed_1:
+undeployed1:
   id: 401
   sha: 4d9278037b872fd9a6690523e411ecb3aa181355
   message: "lets go"
@@ -271,7 +271,7 @@ undeployed_1:
   deletions: 24
   updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
-undeployed_2:
+undeployed2:
   id: 402
   sha: 4890fd8b5f2be05d1fedb763a3605ee461c39074
   message: "sheep it!"
@@ -284,7 +284,7 @@ undeployed_2:
   deletions: 1
   updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
-undeployed_3:
+undeployed3:
   id: 403
   sha: 467578b362bf2b4df5903e1c7960929361c39074
   message: "fix it!"
@@ -297,7 +297,7 @@ undeployed_3:
   deletions: 64
   updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
-undeployed_4:
+undeployed4:
   id: 404
   sha: 447578b362bf2b4df5903e1c7960929361c3435a
   message: "Merge pull request #7 from shipit-engine/yoloshipit\n\nyoloshipit!"
@@ -310,7 +310,7 @@ undeployed_4:
   deletions: 342
   updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
-undeployed_5:
+undeployed5:
   id: 405
   sha: 457578b362bf2b4df5903e1c7960929361c3435a
   message: "Merge pull request #7 from shipit-engine/yoloshipit\n\nyoloshipit!"
@@ -323,7 +323,7 @@ undeployed_5:
   deletions: 342
   updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
-undeployed_6:
+undeployed6:
   id: 406
   sha: 467578b362bf2b4df5903e1c7960929361c3435a
   message: "Merge pull request #7 from shipit-engine/yoloshipit\n\nyoloshipit!"
@@ -336,7 +336,7 @@ undeployed_6:
   deletions: 342
   updated_at: <%= 8.days.ago.to_formatted_s(:db) %>
 
-undeployed_7:
+undeployed7:
   id: 407
   sha: 477578b362bf2b4df5903e1c7960929361c3435a
   message: "Merge pull request #7 from shipit-engine/yoloshipit\n\nyoloshipit!"

data/test/fixtures/shipit/stacks.yml

@@ -10,8 +10,7 @@ shipit:
   cached_deploy_spec: |-
     {
       "machine": {
-        "environment": {
-        }
+        "environment": {}
       },
       "review": {
         "checklist": [
@@ -28,9 +27,7 @@ shipit:
         ]
       },
       "dependencies": {
-        "override": [
-
-        ]
+        "override": []
       },
       "deploy": {
         "override": null,
@@ -494,8 +491,7 @@ review_stack:
   cached_deploy_spec: |-
     {
       "machine": {
-        "environment": {
-        }
+        "environment": {}
       },
       "review": {
         "checklist": [
@@ -512,9 +508,7 @@ review_stack:
         ]
       },
       "dependencies": {
-        "override": [
-
-        ]
+        "override": []
       },
       "deploy": {
         "override": null,

data/test/fixtures/shipit/tasks.yml

@@ -223,7 +223,7 @@ shipit_with_title_parsing_issue:
     {
       "id": "bad-title",
       "action": "Task with bad title",
-      "title": "Using the %{WRONG_VARIABLE_NAME}",
+      "title": "Using the %<WRONG_VARIABLE_NAME>",
       "description": "This task uses the wrong variable name",
       "variables": [
         {"name": "VARIABLE_NAME", "title": "Any old variable"}
@@ -238,7 +238,7 @@ shipit_with_title_parsing_issue:
   started_at: <%= (60 - 3).minutes.ago.to_formatted_s(:db) %>
   ended_at: <%= (60 - 4).minutes.ago.to_formatted_s(:db) %>
 
-shipit_undeployed_1:
+shipit_undeployed1:
   id: 201
   user: walrus
   since_commit_id: 401
@@ -252,7 +252,7 @@ shipit_undeployed_1:
   started_at: <%= (60 - 1).minutes.ago.to_formatted_s(:db) %>
   ended_at: <%= (60 - 3).minutes.ago.to_formatted_s(:db) %>
 
-shipit_undeployed_2:
+shipit_undeployed2:
   id: 202
   user: walrus
   since_commit_id: 402

data/test/helpers/api_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module ApiHelper
   private
 
@@ -14,9 +15,7 @@ module Shipit
     private
 
     def process(_action, **kwargs)
-      if kwargs[:method] != "GET"
-        kwargs[:as] ||= :json
-      end
+      kwargs[:as] ||= :json if kwargs[:method] != "GET"
       super
     end
   end

data/test/helpers/fixture_aliases_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module FixtureAliasesHelper
   def shipit_deploys(*args)
     shipit_tasks(*args)

data/test/helpers/hooks_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module HooksHelper
   def expect_hook(event, stack = nil, payload = nil)
     spy_on_hook

data/test/helpers/json_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module JSONHelper
   UNDEFINED = Object.new.freeze
   private_constant :UNDEFINED
@@ -8,7 +9,7 @@ module JSONHelper
   end
 
   def assert_json_document(document, path, expected_value = UNDEFINED)
-    value = follow_path(path.to_s.split('.'), document: document)
+    value = follow_path(path.to_s.split('.'), document:)
     if block_given?
       yield value
     elsif expected_value == UNDEFINED
@@ -26,7 +27,7 @@ module JSONHelper
       path = nil
     end
 
-    value = follow_path(path.to_s.split('.'), document: document)
+    value = follow_path(path.to_s.split('.'), document:)
     case value
     when Hash
       assert_equal(keys.sort, value.keys.sort)
@@ -38,7 +39,7 @@ module JSONHelper
   def assert_no_json(path, document: response.body)
     segments = path.to_s.split('.')
     last_segment = segments.pop
-    leaf = follow_path(segments, document: document)
+    leaf = follow_path(segments, document:)
     case leaf
     when Hash
       refute(leaf.key?(last_segment), "Expected #{leaf.inspect} not to include #{last_segment.inspect}")

data/test/helpers/links_helper.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 module LinksHelper
-  LINKS_PATTERN = /\<(.*?)\>; rel="(\w+)"/
+  LINKS_PATTERN = /<(.*?)>; rel="(\w+)"/
 
   def assert_link(rel, url)
     assert_includes(response_links, rel)

data/test/helpers/payloads_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module PayloadsHelper
   def payload(name)
     Shipit::Engine.root.join('test/fixtures/payloads', "#{name}.json").read

data/test/helpers/queries_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module QueriesHelper
   def assert_no_queries(ignored_sql = nil, &block)
     assert_queries(0, ignored_sql, &block)
@@ -31,15 +32,14 @@ module QueriesHelper
       /^BEGIN/,
       /^COMMIT/,
       /^SHOW FULL FIELDS/,
-      /^SHOW TABLES LIKE/,
+      /^SHOW TABLES LIKE/
     ]
 
     # FIXME: this needs to be refactored so specific database can add their own
     # ignored SQL.  This ignored SQL is for Oracle.
     ignored_sql.concat([/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im])
 
-    attr_reader :ignore
-    attr_reader :log
+    attr_reader :ignore, :log
 
     def initialize(ignore = nil)
       @ignore = ignore || self.class.ignored_sql
@@ -52,6 +52,7 @@ module QueriesHelper
       # FIXME: this seems bad. we should probably have a better way to indicate
       # the query was cached
       return if values[:name] == 'CACHE' || ignore.any? { |x| x =~ sql }
+
       log << sql
     end
   end

data/test/jobs/cache_deploy_spec_job_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -10,12 +11,12 @@ module Shipit
     end
 
     test "#perform checkout the repository to the last recorded commit and cache the deploy spec" do
-      @stack.update!(cached_deploy_spec: DeploySpec.new('review' => { 'checklist' => %w(foo bar) }))
+      @stack.update!(cached_deploy_spec: DeploySpec.new('review' => { 'checklist' => %w[foo bar] }))
 
       dir = Pathname(Dir.tmpdir)
       StackCommands.any_instance.expects(:with_temporary_working_directory).with(commit: @last_commit).yields(dir)
 
-      assert_equal %w(foo bar), @stack.checklist
+      assert_equal %w[foo bar], @stack.checklist
       @job.perform(@stack)
       assert_equal [], @stack.reload.checklist
     end

data/test/jobs/chunk_rollup_job_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -25,7 +26,7 @@ module Shipit
     test "#peform ignores non-finished jobs" do
       logger = mock
       logger.expects(:error).once
-      @job.stubs(logger: logger)
+      @job.stubs(logger:)
 
       @task.update_attribute(:status, :pending)
 
@@ -35,7 +36,7 @@ module Shipit
     test "#perform ignores tasks already rolled up" do
       logger = mock
       logger.expects(:error).once
-      @job.stubs(logger: logger)
+      @job.stubs(logger:)
 
       @task.rolled_up = true
 

data/test/jobs/deliver_hook_job_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit

data/test/jobs/destroy_repository_job_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit

data/test/jobs/destroy_stack_job_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -24,5 +25,16 @@ module Shipit
         @job.perform(stack)
       end
     end
+
+    test "perform destroys the all Status of related commits" do
+      stack = shipit_stacks(:shipit)
+      Shipit.legacy_github_api.stubs(:remove_hook)
+
+      assert_changes -> { Status.count }, 'Statuses are not deleted' do
+        @job.perform(stack)
+      end
+
+      refute_predicate Status.count, :zero?
+    end
   end
 end

data/test/jobs/emit_event_job_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit

data/test/jobs/fetch_commit_stats_job_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit

data/test/jobs/fetch_deployed_revision_job_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit

data/test/jobs/github_sync_job_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -46,34 +47,34 @@ module Shipit
         ["yoloshipit!", false],
         ["fix it!", false],
         ["sheep it!", false],
-        ["lets go", false],
+        ["lets go", false]
       ]
-      assert_equal initial_queue, @stack.undeployed_commits.map { |c| [c.title, c.locked?] }
+      assert_equal(initial_queue, @stack.undeployed_commits.map { |c| [c.title, c.locked?] })
 
       author = stub(
         id: 1234,
         login: 'bob',
         name: 'Bob the Builder',
         email: 'bob@bob.com',
-        date: '2011-04-14T16:00:49Z',
+        date: '2011-04-14T16:00:49Z'
       )
       @job.expects(:fetch_missing_commits).returns([
-        [
-          stub(
-            sha: '36514755579bfb5bc313f403b216f4347a027990',
-            author: author,
-            committer: author,
-            stats: nil,
-            commit: stub(
-              sha: '36514755579bfb5bc313f403b216f4347a027990',
-              message: 'Revert "fix it!"',
-              author: author,
-              committer: author,
-            ),
-          ),
-        ],
-        shipit_commits(:fifth),
-      ])
+                                                     [
+                                                       stub(
+                                                         sha: '36514755579bfb5bc313f403b216f4347a027990',
+                                                         author:,
+                                                         committer: author,
+                                                         stats: nil,
+                                                         commit: stub(
+                                                           sha: '36514755579bfb5bc313f403b216f4347a027990',
+                                                           message: 'Revert "fix it!"',
+                                                           author:,
+                                                           committer: author
+                                                         )
+                                                       )
+                                                     ],
+                                                     shipit_commits(:fifth)
+                                                   ])
       @job.perform(stack_id: @stack.id)
 
       final_queue = [
@@ -82,9 +83,9 @@ module Shipit
         ["yoloshipit!", true],
         ["fix it!", true],
         ["sheep it!", false],
-        ["lets go", false],
+        ["lets go", false]
       ]
-      assert_equal final_queue, @stack.reload.undeployed_commits.map { |c| [c.title, c.locked?] }
+      assert_equal(final_queue, @stack.reload.undeployed_commits.map { |c| [c.title, c.locked?] })
     end
 
     test "#fetch_missing_commits returns the commits in the reverse order if it doesn't know the parent" do

data/test/jobs/mark_deploy_healthy_job_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit

data/test/jobs/perform_task_job_test.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
   class PerformTaskJobTest < ActiveSupport::TestCase
     class FakeSuccessfulCommand
-      def run
-      end
+      def run; end
 
       def success?
         true
@@ -94,7 +94,7 @@ module Shipit
     end
 
     test "marks deploy as `failed` if a command exit with an error code" do
-      Shipit::TaskExecutionStrategy::Default.any_instance.expects(:capture!).at_least_once.raises(Command::Error.new('something'))
+      Shipit::TaskExecutionStrategy::Default.any_instance.stubs(:capture!).at_least_once.raises(Command::Error.new('something'))
       @job.perform(@deploy)
       assert_equal 'failed', @deploy.reload.status
     end