shipit-engine 0.38.0 → 0.40.0

data/test/jobs/process_merge_requests_job_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -18,15 +19,15 @@ module Shipit
 
     test "#perform rejects unmergeable PRs and merge the others" do
       MergeRequest.any_instance.stubs(:refresh!)
-      stub_request(:put, "#{@pending_pr.api_url}/merge").to_return(status: %w(200 OK), body: {
+      stub_request(:put, "#{@pending_pr.api_url}/merge").to_return(status: %w[200 OK], body: {
         sha: "6dcb09b5b57875f334f61aebed695e2e4193db5e",
         merged: true,
-        message: "Pull Request successfully merged",
+        message: "Pull Request successfully merged"
       }.to_json)
       branch_url = "https://api.github.com/repos/shopify/shipit-engine/git/refs/heads/feature-62"
-      stub_request(:delete, branch_url).to_return(status: %w(204 No content))
+      stub_request(:delete, branch_url).to_return(status: %w[204 No content])
       pulls_url = "https://api.github.com/repos/shopify/shipit-engine/pulls?base=feature-62"
-      stub_request(:get, pulls_url).to_return(status: %w(200 OK), body: '[]')
+      stub_request(:get, pulls_url).to_return(status: %w[200 OK], body: '[]')
 
       @job.perform(@stack)
 
@@ -36,9 +37,9 @@ module Shipit
 
     test "#perform rejects PRs if the merge attempt fails" do
       MergeRequest.any_instance.stubs(:refresh!)
-      stub_request(:put, "#{@pending_pr.api_url}/merge").to_return(status: %w(405 Method not allowed), body: {
+      stub_request(:put, "#{@pending_pr.api_url}/merge").to_return(status: %w[405 Method not allowed], body: {
         message: "Pull Request is not mergeable",
-        documentation_url: "https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button",
+        documentation_url: "https://developer.github.com/v3/pulls/#merge-a-pull-request-merge-button"
       }.to_json)
 
       @job.perform(@stack)

data/test/jobs/purge_old_deliveries_job_test.rb

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

data/test/jobs/reap_dead_tasks_job_test.rb

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

data/test/jobs/refresh_github_user_job_test.rb

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

data/test/jobs/refresh_status_job_test.rb

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

data/test/jobs/shipit/background_job_test.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Shipit
+  class BackgroundJobTest < ActiveSupport::TestCase
+    setup do
+      @stack = shipit_stacks(:shipit)
+      @last_commit = @stack.commits.last
+      @job = CacheDeploySpecJob.new
+      @user = shipit_users(:walrus)
+    end
+
+    test "#perform retries on Octokit secondary rate limit exceptions" do
+      freeze_time do
+        Octokit::Forbidden.any_instance.expects(:response_headers)
+                          .returns({ "Retry-After" => 45 })
+
+        Shipit.github.api.expects(:user).with(@user.github_id).raises(Octokit::TooManyRequests)
+
+        assert_enqueued_with(job: BackgroundStubJob, at: Time.now + 45.seconds) do
+          BackgroundStubJob.perform_now(@user)
+        end
+      end
+    end
+
+    class BackgroundStubJob < BackgroundJob
+      queue_as :default
+
+      def perform(user)
+        Shipit.github.api.user(user.github_id)
+      end
+    end
+  end
+end

data/test/jobs/shipit/continuous_delivery_job_test.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Shipit
+  class ContinuousDeliveryJobTest < ActiveSupport::TestCase
+    test "calls trigger_continous_delivery" do
+      stack = shipit_stacks(:shipit)
+      stack.stubs(:continuous_deployment?).returns(true).once
+      stack.stubs(:occupied).returns(false).once
+      stack.expects(:trigger_continuous_delivery).once
+
+      Shipit::ContinuousDeliveryJob.new.perform(stack)
+    end
+
+    test "does not call trigger_continuous_delivery if outside of schedule" do
+      freeze_time do
+        monday_9am = Date.current.monday.at_beginning_of_day.advance(hours: 9)
+        travel_to(monday_9am)
+
+        stack = shipit_stacks(:shipit)
+        stack.create_continuous_delivery_schedule!(monday_start: "09:30")
+
+        stack.stubs(:continuous_deployment?).returns(true).once
+        stack.expects(:trigger_continuous_delivery).never
+
+        Shipit::ContinuousDeliveryJob.new.perform(stack)
+      end
+    end
+  end
+end

data/test/jobs/unique_job_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -20,7 +21,8 @@ module Shipit
     test "the lock key is serialized" do
       task = shipit_tasks(:shipit_restart)
       job = ChunkRollupJob.new(task)
-      key = %(Shipit::ChunkRollupJob-{"_aj_globalid"=>"gid://shipit/Shipit::Task/#{task.id}"})
+      args = { "_aj_globalid" => "gid://shipit/Shipit::Task/#{task.id}" }
+      key = %(Shipit::ChunkRollupJob-#{args})
       assert_equal key, job.lock_key(*job.arguments)
     end
   end

data/test/jobs/update_github_last_deployed_ref_job_test.rb

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

data/test/middleware/same_site_cookie_middleware_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -14,8 +15,7 @@ module Shipit
     end
 
     def env_for_url(url)
-      env = Rack::MockRequest.env_for(url)
-      env
+      Rack::MockRequest.env_for(url)
     end
 
     def middleware

data/test/models/api_client_test.rb

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

data/test/models/commit_checks_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 require 'tmpdir'
 
@@ -71,7 +72,7 @@ module Shipit
         '',
         '$ echo review',
         'review',
-        '',
+        ''
       ]
       assert_equal 'success', @checks.status
       assert_equal lines, @checks.output.lines.map(&:strip)

data/test/models/commit_deployment_status_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -15,10 +16,9 @@ module Shipit
       @author.github_api.class.any_instance.expects(:create_deployment_status).with(
         @deployment.api_url,
         'in_progress',
-        accept: "application/vnd.github.flash-preview+json",
         target_url: "http://shipit.com/shopify/shipit-engine/production/deploys/#{@task.id}",
         description: "walrus triggered the deploy of shopify/shipit-engine/production to #{@deployment.short_sha}",
-        environment_url: "https://shipit.shopify.com",
+        environment_url: "https://shipit.shopify.com"
       ).returns(response)
 
       @status.create_on_github!

data/test/models/commit_deployment_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -23,9 +24,9 @@ module Shipit
           shipit: {
             task_id: 4,
             from_sha: 'f890fd8b5f2be05d1fedb763a3605ee461c39074',
-            to_sha: '467578b362bf2b4df5903e1c7960929361c3435a',
-          },
-        }.to_json,
+            to_sha: '467578b362bf2b4df5903e1c7960929361c3435a'
+          }
+        }.to_json
       ).returns(deployment_response)
 
       @deployment.create_on_github!

data/test/models/commits_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -11,9 +12,9 @@ module Shipit
       @commit = shipit_commits(:first)
 
       stub_request(:get, "https://api.github.com/user/emails").to_return(
-        status: %w(200 OK),
+        status: %w[200 OK],
         body: {}.to_json,
-        headers: { "Content-Type" => "application/json" },
+        headers: { "Content-Type" => "application/json" }
       )
     end
 
@@ -28,16 +29,16 @@ module Shipit
               author: {
                 name: 'George Abitbol',
                 email: '',
-                date: Time.now,
+                date: Time.now
               },
               committer: {
                 name: 'George Abitbol',
                 email: '',
-                date: Time.now,
+                date: Time.now
               },
-              message: "commit to trigger staging build",
-            },
-          ),
+              message: "commit to trigger staging build"
+            }
+          )
         )
       end
     end
@@ -53,16 +54,16 @@ module Shipit
               author: {
                 name: 'Lando Walrussian',
                 email: 'walrus@shopify.com',
-                date: Time.now,
+                date: Time.now
               },
               committer: {
                 name: 'Lando Walrussian',
                 email: 'walrus@shopify.com',
-                date: Time.now,
+                date: Time.now
               },
-              message: '',
-            },
-          ),
+              message: ''
+            }
+          )
         )
       end
       commit = Commit.last
@@ -82,16 +83,16 @@ module Shipit
               author: {
                 name: 'Lando Walrussian',
                 email: 'walrus@shopify.com',
-                date: Time.now,
+                date: Time.now
               },
               committer: {
                 name: 'Lando Walrussian',
                 email: 'walrus@shopify.com',
-                date: Time.now,
+                date: Time.now
               },
-              message: message,
-            },
-          ),
+              message:
+            }
+          )
         )
       end
 
@@ -113,16 +114,16 @@ module Shipit
               author: {
                 name: 'Shipit',
                 email: '',
-                date: Time.now,
+                date: Time.now
               },
               committer: {
                 name: 'Shipit',
                 email: '',
-                date: Time.now,
+                date: Time.now
               },
-              message: "commit to trigger staging build\n\nMerge-Requested-By: walrus\n",
-            },
-          ),
+              message: "commit to trigger staging build\n\nMerge-Requested-By: walrus\n"
+            }
+          )
         )
       end
 
@@ -141,20 +142,20 @@ module Shipit
               author: {
                 name: 'Shipit',
                 email: '',
-                date: Time.now,
+                date: Time.now
               },
               committer: {
                 name: 'Shipit',
                 email: '',
-                date: Time.now,
+                date: Time.now
               },
-              message: "Merge pull request #62 from shipit-engine/yoloshipit\n\nyoloshipit!",
+              message: "Merge pull request #62 from shipit-engine/yoloshipit\n\nyoloshipit!"
             },
             parents: [
               { sha: "1864542e3d2f8a41916a2dec0f2b4d3c1bf4899b", url: '', html_url: '' },
-              { sha: "63d7e03e517fd2ae1caeb1b7a9f21767f84d671a", url: '', html_url: '' },
-            ],
-          ),
+              { sha: "63d7e03e517fd2ae1caeb1b7a9f21767f84d671a", url: '', html_url: '' }
+            ]
+          )
         )
       end
 
@@ -270,14 +271,14 @@ module Shipit
         author: walrus,
         committer: walrus,
         authored_at: Time.now,
-        committed_at: Time.now,
+        committed_at: Time.now
       )
 
       deploy = @stack.deploys.build(
         user_id: walrus.id,
         since_commit: @stack.commits.first,
         until_commit: new_commit,
-        status: 'success',
+        status: 'success'
       )
       deploy.stubs(:pull_request_head_for_commit).returns(nil)
       deploy.save!
@@ -321,7 +322,7 @@ module Shipit
         sha: "ab12",
         authored_at: Time.now,
         committed_at: Time.now,
-        message: "more fish!",
+        message: "more fish!"
       )
     end
 
@@ -331,7 +332,7 @@ 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(:statuses).with(@stack.github_repo_name, @commit.sha, per_page: 100).returns([status])
       assert_difference '@commit.statuses.count', 1 do
@@ -348,15 +349,16 @@ module Shipit
         details_url: 'https://example.com/details',
         html_url: 'https://example.com/run',
         output: mock(
-          title: 'Tests build ran successfully',
+          title: 'Tests build ran successfully'
         ),
         completed_at: Time.now,
-        started_at: Time.now - 1.minute,
-      )
-      response = mock(
-        check_runs: [check_run],
+        started_at: Time.now - 1.minute
       )
-      Shipit.github.api.expects(:check_runs).with(@stack.github_repo_name, @commit.sha).returns(response)
+      response = stub(rels: {}, data: mock(
+        check_runs: [check_run]
+      ))
+      Shipit.github.api.expects(:check_runs).with(@stack.github_repo_name, @commit.sha, per_page: 100).returns(response.data)
+      Shipit.github.api.expects(:last_response).returns(response)
 
       assert_difference -> { @commit.check_runs.count }, 1 do
         @commit.refresh_check_runs!
@@ -374,7 +376,7 @@ module Shipit
         sha: "ab12",
         authored_at: Time.now,
         committed_at: Time.now,
-        message: "more fish!",
+        message: "more fish!"
       )
       @stack.reload
       assert_equal 3, @stack.undeployed_commits_count
@@ -415,7 +417,7 @@ module Shipit
         sha: "ab12",
         authored_at: Time.now,
         committed_at: Time.now,
-        message: "more fish!",
+        message: "more fish!"
       )
       stack.reload
       assert_nil stack.last_deployed_at
@@ -455,9 +457,9 @@ module Shipit
       assert_equal 'failure', @commit.reload.state
 
       @commit.stack.update!(cached_deploy_spec: DeploySpec.new('ci' => {
-        'hide' => 'metrics/coveralls',
-        'allow_failures' => 'metrics/performance',
-      }))
+                                                                 'hide' => 'metrics/coveralls',
+                                                                 'allow_failures' => 'metrics/performance'
+                                                               }))
       assert_equal 'pending', @commit.reload.state
     end
 
@@ -473,9 +475,9 @@ module Shipit
       assert_predicate commit.status, :group?
       assert_equal 3, commit.status.size
       commit.stack.update!(cached_deploy_spec: DeploySpec.new('ci' => { 'hide' => [
-        'Travis CI',
-        'metrics/coveralls',
-      ] }))
+                                                                'Travis CI',
+                                                                'metrics/coveralls'
+                                                              ] }))
       commit.reload
       refute_predicate commit.status, :group?
     end
@@ -502,7 +504,7 @@ module Shipit
 
     test "#deployable? is false if a required status is missing" do
       commit = shipit_commits(:cyclimse_first)
-      commit.stack.stubs(:required_statuses).returns(%w(ci/very-important))
+      commit.stack.stubs(:required_statuses).returns(%w[ci/very-important])
       refute_predicate commit, :deployable?
     end
 
@@ -598,15 +600,15 @@ module Shipit
     end
 
     expected_webhook_transitions = { # we expect deployable_status to fire on these transitions, and not on any others
-      'unknown' => %w(pending success failure error),
-      'pending' => %w(success failure error),
-      'success' => %w(failure error),
-      'failure' => %w(success),
-      'error' => %w(success),
+      'unknown' => %w[pending success failure error],
+      'pending' => %w[success failure error],
+      'success' => %w[failure error],
+      'failure' => %w[success],
+      'error' => %w[success]
     }
     expected_webhook_transitions.each do |initial_state, firing_states|
       initial_status_attributes = { state: initial_state, description: 'abc', context: 'ci/travis' }
-      (expected_webhook_transitions.keys - %w(unknown)).each do |new_state|
+      (expected_webhook_transitions.keys - %w[unknown]).each do |new_state|
         should_fire = firing_states.include?(new_state)
         action = should_fire ? 'fires' : 'does not fire'
         test "#add_status #{action} for status from #{initial_state} to #{new_state}" do
@@ -618,7 +620,7 @@ module Shipit
           unless initial_state == 'unknown'
             attrs = initial_status_attributes.merge(
               stack_id: commit.stack_id,
-              created_at: 10.days.ago.to_formatted_s(:db),
+              created_at: 10.days.ago.to_formatted_s(:db)
             )
             commit.statuses.create!(attrs)
           end
@@ -651,7 +653,7 @@ module Shipit
           state: 'failure',
           description: 'Sad',
           context: 'ci/hidden',
-          created_at: 1.day.ago.to_formatted_s(:db),
+          created_at: 1.day.ago.to_formatted_s(:db)
         )
         commit.create_status_from_github!(github_status)
       end
@@ -668,7 +670,7 @@ module Shipit
           state: 'failure',
           description: 'Sad',
           context: 'ci/ok_to_fail',
-          created_at: 1.day.ago.to_formatted_s(:db),
+          created_at: 1.day.ago.to_formatted_s(:db)
         )
         commit.create_status_from_github!(github_status)
       end
@@ -683,7 +685,7 @@ module Shipit
           state: 'failure',
           description: 'Sad',
           context: 'ci/travis',
-          created_at: 1.day.ago.to_formatted_s(:db),
+          created_at: 1.day.ago.to_formatted_s(:db)
         )
         commit.create_status_from_github!(github_status)
       end
@@ -695,7 +697,7 @@ module Shipit
         state: 'success',
         description: 'Cool',
         context: 'metrics/coveralls',
-        created_at: 1.day.ago.to_formatted_s(:db),
+        created_at: 1.day.ago.to_formatted_s(:db)
       )
 
       assert_equal 'failure', commit.state
@@ -738,7 +740,7 @@ module Shipit
         committer: shipit_users(:shipit),
         committed_at: Time.now,
         sha: '5590fd8b5f2be05d1fedb763a3605ee461c39074',
-        message: "Merge pull request #62 from shipit-engine/yoloshipit\n\nyoloshipit!",
+        message: "Merge pull request #62 from shipit-engine/yoloshipit\n\nyoloshipit!"
       )
       merge_request = shipit_merge_requests(:shipit_pending)
 
@@ -755,7 +757,7 @@ module Shipit
         committer: shipit_users(:shipit),
         committed_at: Time.now,
         sha: '5590fd8b5f2be05d1fedb763a3605ee461c39074',
-        message: "Merge pull request #99 from shipit-engine/yoloshipit\n\nyoloshipit!",
+        message: "Merge pull request #99 from shipit-engine/yoloshipit\n\nyoloshipit!"
       )
 
       assert_predicate commit, :pull_request?
@@ -771,7 +773,7 @@ module Shipit
         committer: shipit_users(:shipit),
         committed_at: Time.now,
         sha: '5590fd8b5f2be05d1fedb763a3605ee461c39074',
-        message: "Merge pull request #62 from shipit-engine/yoloshipit\n\nyoloshipit!",
+        message: "Merge pull request #62 from shipit-engine/yoloshipit\n\nyoloshipit!"
       )
 
       assert_equal shipit_users(:walrus), commit.author
@@ -784,7 +786,7 @@ module Shipit
         committer: shipit_users(:shipit),
         committed_at: Time.now,
         sha: '5590fd8b5f2be05d1fedb763a3605ee461c39074',
-        message: "Yoloshipit!",
+        message: "Yoloshipit!"
       )
 
       refute_predicate commit, :pull_request?
@@ -800,44 +802,44 @@ module Shipit
 
     test "#revert? returns true for commits reverted by GitHub" do
       commit = Commit.new(
-        message: "Merge pull request #17 from Shopify/revert-16\n\nRevert \"Create README.md\"",
+        message: "Merge pull request #17 from Shopify/revert-16\n\nRevert \"Create README.md\""
       )
       assert_predicate commit, :revert?
     end
 
     test "#revert? returns true for commits reverted from CLI" do
       commit = Commit.new(
-        message: "Revert \"Super Feature\"\n\nThis reverts commit 49430d5091abc34f2c576c23ebf369ec7094d8aa.",
+        message: "Revert \"Super Feature\"\n\nThis reverts commit 49430d5091abc34f2c576c23ebf369ec7094d8aa."
       )
       assert_predicate commit, :revert?
     end
 
     test "#revert_of? works with pull requests reverted on GitHub" do
       commit = Commit.new(
-        message: "Merge pull request #16 from byroot/casperisfine-patch-1\n\nCreate README.md",
+        message: "Merge pull request #16 from byroot/casperisfine-patch-1\n\nCreate README.md"
       )
       revert = Commit.new(
-        message: "Merge pull request #17 from Shopify/revert-16\n\nRevert \"Create README.md\"",
+        message: "Merge pull request #17 from Shopify/revert-16\n\nRevert \"Create README.md\""
       )
       assert revert.revert_of?(commit)
     end
 
     test "#revert_of? works with commits reverted from CLI" do
       commit = Commit.new(
-        message: "Create README.md",
+        message: "Create README.md"
       )
       revert = Commit.new(
-        message: "Revert \"Create README.md\"\n\nThis reverts commit 49430d5091abc34f2c576c23ebf369ec7094d8aa.",
+        message: "Revert \"Create README.md\"\n\nThis reverts commit 49430d5091abc34f2c576c23ebf369ec7094d8aa."
       )
       assert revert.revert_of?(commit)
     end
 
     test "#revert_of? works with pull requests reverted from CLI" do
       commit = Commit.new(
-        message: "Merge pull request #19 from byroot/casperisfine-patch-1\n\nUpdate README.md",
+        message: "Merge pull request #19 from byroot/casperisfine-patch-1\n\nUpdate README.md"
       )
       revert = Commit.new(
-        message: "Revert \"Merge pull request #19 from byroot/casperisfine-patch-1\"\n\nThis reverts commit fa3722ef8372b47160f5d96010d3c54743d192f9, reversing\nchanges made to 868b6f65f759d003c04d056f2f928f18d6813c7e.",
+        message: "Revert \"Merge pull request #19 from byroot/casperisfine-patch-1\"\n\nThis reverts commit fa3722ef8372b47160f5d96010d3c54743d192f9, reversing\nchanges made to 868b6f65f759d003c04d056f2f928f18d6813c7e."
       )
       assert revert.revert_of?(commit)
     end

data/test/models/delivery_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -13,7 +14,7 @@ module Shipit
         event: 'deploy',
         url: 'http://example.com',
         content_type: 'application/json',
-        payload: '{}',
+        payload: '{}'
       )
       assert_equal 'pending', delivery.status
 
@@ -25,7 +26,7 @@ module Shipit
 
     test "#send! post the payload and update the status to `sent`" do
       headers = { 'content-type' => 'text/plain', 'content-length' => '2' }
-      stub_request(:post, @delivery.url).to_return(headers: headers, body: 'OK')
+      stub_request(:post, @delivery.url).to_return(headers:, body: 'OK')
 
       assert_equal 'scheduled', @delivery.status
       @delivery.send!