shipit-engine 0.38.0 → 0.40.0

data/test/models/deploys_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -66,8 +67,8 @@ module Shipit
       deploy_stack = runnable_deploy.stack
 
       Shipit::Deploy.any_instance.expects(:acquire_git_cache_lock).twice
-        .raises(Shipit::Command::TimedOut, 'Deploy timed out')
-        .then.raises(Shipit::Command::Error, "Second command error failure")
+                    .raises(Shipit::Command::TimedOut, 'Deploy timed out')
+                    .then.raises(Shipit::Command::Error, "Second command error failure")
 
       perform_enqueued_jobs(only: Shipit::PerformTaskJob) do
         runnable_deploy.enqueue
@@ -90,8 +91,8 @@ module Shipit
       deploy_stack = runnable_deploy.stack
 
       Shipit::Deploy.any_instance.expects(:acquire_git_cache_lock).twice
-        .raises(Shipit::Command::Error, 'Deploy failed')
-        .then.raises(Shipit::Command::Error, "Second deploy failed")
+                    .raises(Shipit::Command::Error, 'Deploy failed')
+                    .then.raises(Shipit::Command::Error, "Second deploy failed")
 
       perform_enqueued_jobs(only: Shipit::PerformTaskJob) do
         runnable_deploy.enqueue
@@ -114,8 +115,8 @@ module Shipit
       deploy_stack = runnable_deploy.stack
 
       Shipit::Deploy.any_instance.expects(:acquire_git_cache_lock).twice
-        .raises(StandardError, 'Deploy failed')
-        .then.raises(StandardError, "Second deploy failed")
+                    .raises(StandardError, 'Deploy failed')
+                    .then.raises(StandardError, "Second deploy failed")
 
       perform_enqueued_jobs(only: Shipit::PerformTaskJob) do
         runnable_deploy.enqueue
@@ -138,7 +139,7 @@ module Shipit
       runnable_deploy.update!(retry_attempt: 0, max_retries: 0)
 
       Shipit::Deploy.any_instance.expects(:acquire_git_cache_lock)
-        .raises(Shipit::Command::TimedOut, 'Deploy timed out')
+                    .raises(Shipit::Command::TimedOut, 'Deploy timed out')
 
       perform_enqueued_jobs(only: Shipit::PerformTaskJob) do
         runnable_deploy.enqueue
@@ -157,8 +158,8 @@ module Shipit
       DeploySpec.any_instance.expects(:retries_on_rollback).returns(1)
 
       Shipit::Command.any_instance.expects(:run).twice
-        .raises(Shipit::Command::TimedOut, 'Rollback timed out')
-        .then.raises(Shipit::Command::Error, "Second command error failure")
+                     .raises(Shipit::Command::TimedOut, 'Rollback timed out')
+                     .then.raises(Shipit::Command::Error, "Second command error failure")
 
       first_rollback = nil
 
@@ -185,8 +186,8 @@ module Shipit
       DeploySpec.any_instance.expects(:retries_on_rollback).returns(0)
 
       Shipit::Command.any_instance.expects(:run).once
-        .raises(Shipit::Command::TimedOut, 'Rollback timed out')
-        .then.raises(Shipit::Command::Error, "Second command error failure")
+                     .raises(Shipit::Command::TimedOut, 'Rollback timed out')
+                     .then.raises(Shipit::Command::Error, "Second command error failure")
 
       first_rollback = nil
 
@@ -208,7 +209,7 @@ module Shipit
 
       deploy = stack.deploys.create!(
         since_commit: first,
-        until_commit: third,
+        until_commit: third
       )
 
       assert_equal 13, deploy.additions
@@ -222,7 +223,7 @@ module Shipit
 
       deploy = stack.deploys.new(
         since_commit: first,
-        until_commit: last,
+        until_commit: last
       )
 
       commits = deploy.commits
@@ -239,7 +240,7 @@ module Shipit
 
       deploy = stack.deploys.new(
         since_commit: first,
-        until_commit: last,
+        until_commit: last
       )
 
       assert_equal [4, 3, 2], deploy.commits.pluck(:id)
@@ -260,7 +261,7 @@ module Shipit
 
       expect_event(deploy)
       deploy.status = 'running'
-      expect_hook(:deploy, deploy.stack, status: 'success', deploy: deploy, stack: deploy.stack) do
+      expect_hook(:deploy, deploy.stack, status: 'success', deploy:, stack: deploy.stack) do
         deploy.complete!
       end
     end
@@ -280,7 +281,7 @@ module Shipit
 
       expect_event(deploy)
       deploy.status = 'running'
-      expect_hook(:deploy, deploy.stack, status: 'failed', deploy: deploy, stack: deploy.stack) do
+      expect_hook(:deploy, deploy.stack, status: 'failed', deploy:, stack: deploy.stack) do
         deploy.failure!
       end
     end
@@ -300,7 +301,7 @@ module Shipit
 
       expect_event(deploy)
       deploy.status = 'running'
-      expect_hook(:deploy, deploy.stack, status: 'error', deploy: deploy, stack: deploy.stack) do
+      expect_hook(:deploy, deploy.stack, status: 'error', deploy:, stack: deploy.stack) do
         deploy.error!
       end
     end
@@ -320,7 +321,7 @@ module Shipit
 
       expect_event(deploy)
       deploy.status = 'pending'
-      expect_hook(:deploy, deploy.stack, status: 'running', deploy: deploy, stack: deploy.stack) do
+      expect_hook(:deploy, deploy.stack, status: 'running', deploy:, stack: deploy.stack) do
         deploy.run!
       end
     end
@@ -339,7 +340,7 @@ module Shipit
       shipit = shipit_stacks(:shipit)
       deploy = shipit.deploys.build(
         since_commit: shipit.commits.first,
-        until_commit: shipit.commits.last,
+        until_commit: shipit.commits.last
       )
       deploy.stubs(:merge_request_head_for_commit).returns(nil)
 
@@ -436,6 +437,7 @@ module Shipit
       @deploy = shipit_deploys(:shipit_running)
       @deploy.ping
       @deploy.pid = 42
+      @deploy.env = { 'CUSTOM_VAR' => 'value' }
       @deploy.abort!(rollback_once_aborted: true, aborted_by: @user)
 
       assert_difference -> { @stack.rollbacks.count }, 1 do
@@ -443,6 +445,9 @@ module Shipit
           @deploy.aborted!
         end
       end
+
+      rollback = @stack.rollbacks.last
+      assert_equal({ 'CUSTOM_VAR' => 'value' }, rollback.env)
     end
 
     test "transitioning to aborted schedule a rollback to the designated deploy if set" do
@@ -450,6 +455,7 @@ module Shipit
       @deploy = shipit_deploys(:shipit_running)
       @deploy.ping
       @deploy.pid = 42
+      @deploy.env = { 'CUSTOM_VAR' => 'value' }
       @deploy.abort!(rollback_once_aborted: true, rollback_once_aborted_to: @rollback_to, aborted_by: @user)
 
       assert_difference -> { @stack.rollbacks.count }, 1 do
@@ -457,6 +463,9 @@ module Shipit
           @deploy.aborted!
         end
       end
+
+      rollback = @stack.rollbacks.last
+      assert_equal({ 'CUSTOM_VAR' => 'value' }, rollback.env)
     end
 
     test "transitioning to aborted locks the stack if a rollback is scheduled" do
@@ -513,18 +522,18 @@ module Shipit
 
     def create_test_stack(repository: Shipit::Repository.find_or_create_by!(owner: "shopify-test", name: "shipit-engine-test"))
       Shipit::Stack.create(
-        repository: repository,
+        repository:,
         environment: 'production',
         branch: "master",
         merge_queue_enabled: true,
         created_at: "2019-01-01 00:00:00",
-        updated_at: "2019-01-02 10:10:10",
+        updated_at: "2019-01-02 10:10:10"
       )
     end
 
     def create_test_commit(stack_id:, user_id:)
       Shipit::Commit.new(
-        stack_id: stack_id,
+        stack_id:,
         author_id: user_id,
         sha: SecureRandom.hex(20),
         additions: 2,
@@ -532,27 +541,27 @@ module Shipit
         committer_id: user_id,
         message: "Some commit message.",
         authored_at: "2019-01-02 10:11:10",
-        committed_at: "2019-01-02 10:11:10",
+        committed_at: "2019-01-02 10:11:10"
       )
     end
 
     def create_test_status(commit_id:, stack_id:, state: "success")
       Shipit::Status.new(
         description: "Description for commit #{commit_id}",
-        stack_id: stack_id,
-        commit_id: commit_id,
-        state: state,
+        stack_id:,
+        commit_id:,
+        state:
       )
     end
 
     def create_test_deploy(stack_id:, user_id:, since_commit_id:, until_commit_id: since_commit_id)
       Shipit::Deploy.new(
-        stack_id: stack_id,
-        user_id: user_id,
-        since_commit_id: since_commit_id,
-        until_commit_id: until_commit_id,
+        stack_id:,
+        user_id:,
+        since_commit_id:,
+        until_commit_id:,
         status: "success",
-        type: "Shipit::Deploy",
+        type: "Shipit::Deploy"
       )
     end
 
@@ -567,13 +576,13 @@ module Shipit
     def generate_commits(amount:, stack_id:, user_id:, validate:)
       commit_ids = []
       amount.times do
-        commit = create_test_commit(stack_id: stack_id, user_id: user_id)
+        commit = create_test_commit(stack_id:, user_id:)
         commit.save
         commit.reload
         commit_ids << commit.id
       end
 
-      if validate then assert_generated_record_ids_are_sequential(commit_ids) end
+      assert_generated_record_ids_are_sequential(commit_ids) if validate
       commit_ids
     end
 
@@ -585,11 +594,11 @@ module Shipit
       stack_id = test_stack.id
 
       # Create valid commit history for the stack. We need several commits to deploy and roll back through.
-      commit_ids = generate_commits(amount: 4, stack_id: stack_id, user_id: user_id, validate: true)
-      commit_ids.each { |commit_id| create_test_status(commit_id: commit_id, stack_id: stack_id, state: "success").save }
+      commit_ids = generate_commits(amount: 4, stack_id:, user_id:, validate: true)
+      commit_ids.each { |commit_id| create_test_status(commit_id:, stack_id:, state: "success").save }
 
       # Three deploys of commits 1-2, 2-3 and 3-4 respectively. Reverting last should result in Deploy 3 (commit 3) being latest.
-      3.times { |index| create_test_deploy(stack_id: stack_id, user_id: user_id, since_commit_id: commit_ids[index], until_commit_id: commit_ids[index + 1]).save }
+      3.times { |index| create_test_deploy(stack_id:, user_id:, since_commit_id: commit_ids[index], until_commit_id: commit_ids[index + 1]).save }
 
       # Get the reference with Rails-mutated field values.
       commit3 = Shipit::Commit.second_to_last
@@ -621,7 +630,7 @@ module Shipit
       running_deploy = shipit_deploys(:shipit_running)
       rollback_to = shipit_deploys(:shipit_pending)
 
-      final_rollback = running_deploy.trigger_revert(rollback_to: rollback_to)
+      final_rollback = running_deploy.trigger_revert(rollback_to:)
 
       assert_equal "Shipit::Rollback", final_rollback.type
       assert_equal 4, final_rollback.until_commit_id
@@ -635,8 +644,8 @@ module Shipit
       stack_id = test_stack.id
 
       # Create valid commit history for the stack. We need several commits to deploy and roll back through.
-      commit_ids = generate_commits(amount: 4, stack_id: stack_id, user_id: user_id, validate: true)
-      commit_ids.each { |commit_id| create_test_status(commit_id: commit_id, stack_id: stack_id, state: "success").save }
+      commit_ids = generate_commits(amount: 4, stack_id:, user_id:, validate: true)
+      commit_ids.each { |commit_id| create_test_status(commit_id:, stack_id:, state: "success").save }
 
       # We want the following order of Deploys:
       # 1. Success (commits 1-2)
@@ -645,10 +654,10 @@ module Shipit
       # 4. Running (commits 3-4)
       # 5. Reversion of the running deploy to the last successful deploy. (-> commits 1-2, i.e. the successful deploy.)
 
-      deploy1 = create_test_deploy(stack_id: stack_id, user_id: user_id, since_commit_id: commit_ids[0], until_commit_id: commit_ids[1])
+      deploy1 = create_test_deploy(stack_id:, user_id:, since_commit_id: commit_ids[0], until_commit_id: commit_ids[1])
       deploy1.save
 
-      deploy2 = create_test_deploy(stack_id: stack_id, user_id: user_id, since_commit_id: commit_ids[1], until_commit_id: commit_ids[2])
+      deploy2 = create_test_deploy(stack_id:, user_id:, since_commit_id: commit_ids[1], until_commit_id: commit_ids[2])
       deploy2.status = "faulty"
       deploy2.save
 
@@ -658,7 +667,7 @@ module Shipit
 
       assert_equal commit_ids[1], test_stack.last_deployed_commit.id
 
-      deploy3 = create_test_deploy(stack_id: stack_id, user_id: user_id, since_commit_id: commit_ids[2], until_commit_id: commit_ids[3])
+      deploy3 = create_test_deploy(stack_id:, user_id:, since_commit_id: commit_ids[2], until_commit_id: commit_ids[3])
       deploy3.status = "running"
       deploy3.rollback_once_aborted = false
       deploy3.save
@@ -693,8 +702,8 @@ module Shipit
       stack_id = test_stack.id
 
       # Create valid commit history for the stack. We need several commits to deploy and roll back through.
-      commit_ids = generate_commits(amount: 4, stack_id: stack_id, user_id: user_id, validate: true)
-      commit_ids.each { |commit_id| create_test_status(commit_id: commit_id, stack_id: stack_id, state: "success").save }
+      commit_ids = generate_commits(amount: 4, stack_id:, user_id:, validate: true)
+      commit_ids.each { |commit_id| create_test_status(commit_id:, stack_id:, state: "success").save }
 
       # We want the following order of Deploys:
       # 1. Success (commits 1-2)
@@ -703,14 +712,14 @@ module Shipit
       # 4. Reversion of the running deploy to the last successful deploy. (-> commits 1-2, i.e. the successful deploy.)
       # If the revert functionality doesn't restrict to deploys and rollbacks, then commit 3 will be latest deployed when the reversion is done.
 
-      deploy1 = create_test_deploy(stack_id: stack_id, user_id: user_id, since_commit_id: commit_ids[0], until_commit_id: commit_ids[1])
+      deploy1 = create_test_deploy(stack_id:, user_id:, since_commit_id: commit_ids[0], until_commit_id: commit_ids[1])
       deploy1.save
 
-      deploy2 = create_test_deploy(stack_id: stack_id, user_id: user_id, since_commit_id: commit_ids[1], until_commit_id: commit_ids[2])
+      deploy2 = create_test_deploy(stack_id:, user_id:, since_commit_id: commit_ids[1], until_commit_id: commit_ids[2])
       deploy2.type = "Shipit::Fake"
       deploy2.save
 
-      deploy3 = create_test_deploy(stack_id: stack_id, user_id: user_id, since_commit_id: commit_ids[2], until_commit_id: commit_ids[3])
+      deploy3 = create_test_deploy(stack_id:, user_id:, since_commit_id: commit_ids[2], until_commit_id: commit_ids[3])
       deploy3.status = "running"
       deploy3.rollback_once_aborted = false
       deploy3.save
@@ -744,8 +753,8 @@ module Shipit
       stack_id = test_stack.id
 
       # Create valid commit history for the stack. We need several commits to deploy and roll back through.
-      commit_ids = generate_commits(amount: 4, stack_id: stack_id, user_id: user_id, validate: true)
-      commit_ids.each { |commit_id| create_test_status(commit_id: commit_id, stack_id: stack_id, state: "success").save }
+      commit_ids = generate_commits(amount: 4, stack_id:, user_id:, validate: true)
+      commit_ids.each { |commit_id| create_test_status(commit_id:, stack_id:, state: "success").save }
 
       # We want the following order of Deploys:
       # 1. Success (commits 1-2)
@@ -754,13 +763,13 @@ module Shipit
       # 4. Reversion of the running deploy to the last successful deploy of the same stack. (-> commits 1-2, i.e. the successful deploy.)
       # If the revert functionality doesn't restrict to the correct stack, then commit 3 will be latest deployed when the reversion is done.
 
-      deploy1 = create_test_deploy(stack_id: stack_id, user_id: user_id, since_commit_id: commit_ids[0], until_commit_id: commit_ids[1])
+      deploy1 = create_test_deploy(stack_id:, user_id:, since_commit_id: commit_ids[0], until_commit_id: commit_ids[1])
       deploy1.save
 
-      deploy2 = create_test_deploy(stack_id: other_stack.id, user_id: user_id, since_commit_id: commit_ids[1], until_commit_id: commit_ids[2])
+      deploy2 = create_test_deploy(stack_id: other_stack.id, user_id:, since_commit_id: commit_ids[1], until_commit_id: commit_ids[2])
       deploy2.save
 
-      deploy3 = create_test_deploy(stack_id: stack_id, user_id: user_id, since_commit_id: commit_ids[2], until_commit_id: commit_ids[3])
+      deploy3 = create_test_deploy(stack_id:, user_id:, since_commit_id: commit_ids[2], until_commit_id: commit_ids[3])
       deploy3.status = "running"
       deploy3.rollback_once_aborted = false
       deploy3.save
@@ -788,9 +797,9 @@ module Shipit
       test_stack.reload
       stack_id = test_stack.id
 
-      commit_ids = generate_commits(amount: 2, stack_id: stack_id, user_id: user_id, validate: true)
-      commit_ids.each { |commit_id| create_test_status(commit_id: commit_id, stack_id: stack_id, state: "success").save }
-      deploy1 = create_test_deploy(stack_id: stack_id, user_id: user_id, since_commit_id: commit_ids[0], until_commit_id: commit_ids[1])
+      commit_ids = generate_commits(amount: 2, stack_id:, user_id:, validate: true)
+      commit_ids.each { |commit_id| create_test_status(commit_id:, stack_id:, state: "success").save }
+      deploy1 = create_test_deploy(stack_id:, user_id:, since_commit_id: commit_ids[0], until_commit_id: commit_ids[1])
       deploy1.save
 
       rollback = deploy1.trigger_revert
@@ -1093,7 +1102,7 @@ module Shipit
       template_task = shipit_tasks(:shipit_pending)
       deploy = template_task.stack.deploys.build(
         since_commit: template_task.since_commit,
-        until_commit: template_task.until_commit,
+        until_commit: template_task.until_commit
       )
 
       expected_delta = deploy.commits.select(&:pull_request?).size + 1

data/test/models/duration_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -7,7 +8,6 @@ module Shipit
       assert_equal Duration.new(1), Duration.new(1)
       assert Duration.new(2) > Duration.new(1)
       assert Duration.new(2) > 1
-      assert 1 < Duration.new(2)
     end
 
     test "can be added to a Time instance" do

data/test/models/github_hook_test.rb

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

data/test/models/hook_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -21,11 +22,11 @@ module Shipit
     end
 
     test "#events is accessible as an array" do
-      assert_equal %w(deploy rollback), @hook.events
+      assert_equal %w[deploy rollback], @hook.events
     end
 
     test "#events can only contain a defined set of values" do
-      @hook.events = %w(foo)
+      @hook.events = %w[foo]
       refute @hook.valid?
       assert_equal ["Events is not a strict subset of #{Hook::EVENTS.inspect}"], @hook.errors.full_messages
     end
@@ -82,7 +83,7 @@ module Shipit
     test ".emit calls #deliver on internal hooks" do
       original_receivers = Shipit.internal_hook_receivers
       FakeReceiver = Module.new
-      FakeReceiver.expects(:deliver).with(:deploy, @stack, 'foo' => 42)
+      FakeReceiver.expects(:deliver).with(:deploy, @stack, { 'foo' => 42 })
 
       Shipit.internal_hook_receivers << FakeReceiver
       Hook.emit(:deploy, @stack, 'foo' => 42)
@@ -93,7 +94,9 @@ module Shipit
     test ".emit calls no internal hooks if there are no internal_hook_receivers" do
       original_receivers = Shipit.internal_hook_receivers
       Shipit.internal_hook_receivers = nil
-      Hook.emit(:deploy, @stack, 'foo' => 42)
+      assert_nothing_raised do
+        Hook.emit(:deploy, @stack, 'foo' => 42)
+      end
     ensure
       Shipit.internal_hook_receivers = original_receivers
     end

data/test/models/membership_test.rb

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

data/test/models/merge_request_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -82,38 +83,38 @@ module Shipit
           merged_at: nil,
           head: stub(
             ref: 'super-branch',
-            sha: head_sha,
+            sha: head_sha
           ),
           base: stub(
-            ref:  'default-branch',
-            sha: base_sha,
-          ),
-        ),
+            ref: 'default-branch',
+            sha: base_sha
+          )
+        )
       )
 
       author = stub(
         id: 1234,
         login: 'bob',
         name: 'Bob the Builder',
-        email: 'bob@bob.com',
+        email: 'bob@bob.com'
       )
 
       [head_sha, base_sha].each do |sha|
         Shipit.github.api.expects(:commit).with(@stack.github_repo_name, sha).returns(
           stub(
-            sha: sha,
-            author: author,
+            sha:,
+            author:,
             committer: author,
             commit: stub(
               message: 'Great feature',
               author: stub(date: 1.day.ago),
-              committer: stub(date: 1.day.ago),
+              committer: stub(date: 1.day.ago)
             ),
             stats: stub(
               additions: 24,
-              deletions: 5,
-            ),
-          ),
+              deletions: 5
+            )
+          )
         )
       end
 
@@ -122,24 +123,26 @@ module Shipit
         description: nil,
         context: 'default',
         target_url: 'http://example.com',
-        created_at: 1.day.ago,
+        created_at: 1.day.ago
       )])
 
-      Shipit.github.api.expects(:check_runs).with(@stack.github_repo_name, head_sha).returns(stub(
+      response = stub(rels: {}, data: stub(
         check_runs: [stub(
-          id: 123456,
+          id: 123_456,
           name: 'check run',
           conclusion: 'success',
           output: stub(
-            title: 'a test checkrun',
+            title: 'a test checkrun'
           ),
           details_url: 'http://example.com',
           html_url: 'http://example.com',
           completed_at: Time.now,
-          started_at: 1.minute.ago,
+          started_at: 1.minute.ago
         )]
       ))
 
+      Shipit.github.api.expects(:last_response).returns(response)
+      Shipit.github.api.expects(:check_runs).with(@stack.github_repo_name, head_sha, per_page: 100).returns(response.data)
       merge_request.refresh!
 
       assert_predicate merge_request, :mergeable?
@@ -243,7 +246,10 @@ module Shipit
     end
 
     test "status transitions emit hooks" do
-      job = assert_enqueued_with(job: EmitEventJob) do
+      expected_args = lambda do |job_args|
+        job_args.first[:event] == 'merge'
+      end
+      job = assert_enqueued_with(job: EmitEventJob, args: expected_args) do
         @pr.reject!('merge_conflict')
       end
       params = job.arguments.first
@@ -284,8 +290,8 @@ module Shipit
       @pr.base_ref = 'default-branch'
       Shipit.github.api.expects(:compare).with(@stack.github_repo_name, @pr.base_ref, @pr.head.sha).returns(
         stub(
-          behind_by: 10,
-        ),
+          behind_by: 10
+        )
       )
       spec = { 'merge' => { 'max_divergence' => { 'commits' => 1 } } }
       @pr.stack.cached_deploy_spec = DeploySpec.new(spec)

data/test/models/release_statuses_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -10,7 +11,7 @@ module Shipit
         'pending',
         context: 'shipit/canaries',
         target_url: 'https://example.com/deploys/42',
-        description: 'Deploy started',
+        description: 'Deploy started'
       ).returns(resource(id: 42))
 
       @status = shipit_release_statuses(:to_be_created)

data/test/models/rollbacks_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -36,13 +37,13 @@ module Shipit
         author: reverted_commit.author,
         committer: reverted_commit.committer,
         authored_at: Time.zone.now,
-        committed_at: Time.zone.now,
+        committed_at: Time.zone.now
       )
 
       expected = [
         ['Revert "Merge pull request #7 from shipit-engine/yoloshipit"', false, nil],
         ["whoami", false, nil],
-        ['fix all the things', false, nil],
+        ['fix all the things', false, nil]
       ]
       assert_equal(expected, @stack.undeployed_commits.map { |c| [c.title, c.locked?, c.lock_author_id] })
 
@@ -55,7 +56,7 @@ module Shipit
         ['Revert "Merge pull request #7 from shipit-engine/yoloshipit"', false, nil],
         ["whoami", true, user_id],
         ['fix all the things', true, user_id],
-        ['yoloshipit!', true, user_id],
+        ['yoloshipit!', true, user_id]
       ]
 
       assert_equal(expected, @stack.undeployed_commits.map { |c| [c.title, c.locked?, c.lock_author_id] })