shipit-engine 0.32.0 → 0.35.1

data/test/models/hook_test.rb

@@ -36,6 +36,35 @@ module Shipit
       end
     end
 
+    test ".deliver! sends request with correct method, headers, and body" do
+      stub_request(:post, @hook.delivery_url).to_return(body: 'OK')
+      body = { 'foo' => 42 }
+      expected_body = JSON.pretty_generate(body)
+      expected_signature = Hook::DeliverySigner.new(@hook.secret).sign(expected_body)
+
+      perform_enqueued_jobs(only: DeliverHookJob) do
+        @hook.deliver!(:deploy, body)
+      end
+      assert_performed_jobs 1
+      assert_requested :post, @hook.delivery_url do |req|
+        req.headers['X-Shipit-Signature'] == expected_signature
+      end
+    end
+
+    test ".deliver! sends without signature if no secret is configured" do
+      stub_request(:post, @hook.delivery_url).to_return(body: 'OK')
+      @hook.update!(secret: '')
+      body = { 'foo' => 42 }
+
+      perform_enqueued_jobs(only: DeliverHookJob) do
+        @hook.deliver!(:deploy, body)
+      end
+      assert_performed_jobs 1
+      assert_requested :post, @hook.delivery_url do |req|
+        !req.headers.key?('X-Shipit-Signature')
+      end
+    end
+
     test ".scoped? returns true if the hook has a stack_id" do
       @hook.stack_id = nil
       refute @hook.scoped?
@@ -73,7 +102,7 @@ module Shipit
       locked_stack = Stack.first
       locked_stack.lock("Some Reason", nil)
       serialized = Hook.coerce_payload(stack: locked_stack)
-      assert_json("stack.lock_author.anonymous", true, document: serialized)
+      assert_json_document(serialized, "stack.lock_author.anonymous", true)
     end
   end
 end

data/test/models/{pull_request_test.rb → merge_request_test.rb}

@@ -2,24 +2,24 @@
 require 'test_helper'
 
 module Shipit
-  class PullRequestTest < ActiveSupport::TestCase
+  class MergeRequestTest < ActiveSupport::TestCase
     setup do
       @stack = shipit_stacks(:shipit)
-      @pr = shipit_pull_requests(:shipit_pending)
+      @pr = shipit_merge_requests(:shipit_pending)
       @user = shipit_users(:walrus)
     end
 
     test ".request_merge! creates a record and schedule a refresh" do
-      pull_request = nil
-      assert_enqueued_with(job: RefreshPullRequestJob) do
-        pull_request = PullRequest.request_merge!(@stack, 64, @user)
+      merge_request = nil
+      assert_enqueued_with(job: RefreshMergeRequestJob) do
+        merge_request = MergeRequest.request_merge!(@stack, 64, @user)
       end
-      assert_predicate pull_request, :persisted?
+      assert_predicate merge_request, :persisted?
     end
 
     test ".request_merge! only track pull requests once" do
-      assert_difference -> { PullRequest.count }, +1 do
-        5.times { PullRequest.request_merge!(@stack, 999, @user) }
+      assert_difference -> { MergeRequest.count }, +1 do
+        5.times { MergeRequest.request_merge!(@stack, 999, @user) }
       end
     end
 
@@ -27,7 +27,7 @@ module Shipit
       original_merge_requested_at = @pr.merge_requested_at
       @pr.cancel!
       assert_predicate @pr, :canceled?
-      PullRequest.request_merge!(@stack, @pr.number, @user)
+      MergeRequest.request_merge!(@stack, @pr.number, @user)
       assert_predicate @pr.reload, :pending?
       assert_not_equal original_merge_requested_at, @pr.merge_requested_at
       assert_in_delta Time.now.utc, @pr.merge_requested_at, 2
@@ -37,7 +37,7 @@ module Shipit
       original_merge_requested_at = @pr.merge_requested_at
       @pr.reject!('merge_conflict')
       assert_predicate @pr, :rejected?
-      PullRequest.request_merge!(@stack, @pr.number, @user)
+      MergeRequest.request_merge!(@stack, @pr.number, @user)
       assert_predicate @pr.reload, :pending?
       assert_not_equal original_merge_requested_at, @pr.merge_requested_at
       assert_in_delta Time.now.utc, @pr.merge_requested_at, 2
@@ -48,29 +48,29 @@ module Shipit
       original_merge_requested_at = @pr.merge_requested_at
       @pr.revalidate!
       assert_predicate @pr, :revalidating?
-      PullRequest.request_merge!(@stack, @pr.number, @user)
+      MergeRequest.request_merge!(@stack, @pr.number, @user)
       assert_predicate @pr.reload, :pending?
       assert_equal original_merge_requested_at, @pr.merge_requested_at
     end
 
     test ".extract_number can get a pull request number from different formats" do
-      assert_equal 42, PullRequest.extract_number(@stack, '42')
-      assert_equal 42, PullRequest.extract_number(@stack, '#42')
-      assert_equal 42, PullRequest.extract_number(@stack, 'https://github.com/Shopify/shipit-engine/pull/42')
+      assert_equal 42, MergeRequest.extract_number(@stack, '42')
+      assert_equal 42, MergeRequest.extract_number(@stack, '#42')
+      assert_equal 42, MergeRequest.extract_number(@stack, 'https://github.com/Shopify/shipit-engine/pull/42')
 
-      assert_nil PullRequest.extract_number(@stack, 'https://github.com/ACME/shipit-engine/pull/42')
+      assert_nil MergeRequest.extract_number(@stack, 'https://github.com/ACME/shipit-engine/pull/42')
 
-      Shipit.github.expects(:domain).returns('github.acme.com').at_least_once
-      assert_equal 42, PullRequest.extract_number(@stack, 'https://github.acme.com/Shopify/shipit-engine/pull/42')
-      assert_nil PullRequest.extract_number(@stack, 'https://github.com/Shopify/shipit-engine/pull/42')
+      Shipit.github.class.any_instance.expects(:domain).returns('github.acme.com').at_least_once
+      assert_equal 42, MergeRequest.extract_number(@stack, 'https://github.acme.com/Shopify/shipit-engine/pull/42')
+      assert_nil MergeRequest.extract_number(@stack, 'https://github.com/Shopify/shipit-engine/pull/42')
     end
 
     test "refresh! pulls state from GitHub" do
-      pull_request = shipit_pull_requests(:shipit_fetching)
+      merge_request = shipit_merge_requests(:shipit_fetching)
 
       head_sha = '64b3833d39def7ec65b57b42f496eb27ab4980b6'
       base_sha = 'ba7ab50e02286f7d6c60c1ef75258133dd9ea763'
-      Shipit.github.api.expects(:pull_request).with(@stack.github_repo_name, pull_request.number).returns(
+      Shipit.github.api.expects(:pull_request).with(@stack.github_repo_name, merge_request.number).returns(
         stub(
           id: 4_857_578,
           url: 'https://api.github.com/repos/Shopify/shipit-engine/pulls/64',
@@ -125,15 +125,30 @@ module Shipit
         created_at: 1.day.ago,
       )])
 
-      pull_request.refresh!
-
-      assert_predicate pull_request, :mergeable?
-      assert_predicate pull_request, :pending?
-      assert_equal 'super-branch', pull_request.branch
-
-      assert_not_nil pull_request.head
-      assert_predicate pull_request.head, :detached?
-      assert_predicate pull_request.head, :success?
+      Shipit.github.api.expects(:check_runs).with(@stack.github_repo_name, head_sha).returns(stub(
+        check_runs: [stub(
+          id: 123456,
+          name: 'check run',
+          conclusion: 'success',
+          output: stub(
+            title: 'a test checkrun',
+          ),
+          details_url: 'http://example.com',
+          html_url: 'http://example.com',
+          completed_at: Time.now,
+          started_at: 1.minute.ago,
+        )]
+      ))
+
+      merge_request.refresh!
+
+      assert_predicate merge_request, :mergeable?
+      assert_predicate merge_request, :pending?
+      assert_equal 'super-branch', merge_request.branch
+
+      assert_not_nil merge_request.head
+      assert_predicate merge_request.head, :detached?
+      assert_predicate merge_request.head, :success?
     end
 
     test "#reject! records the reason" do
@@ -216,11 +231,11 @@ module Shipit
       assert_equal 'requires_rebase', @pr.rejection_reason
     end
 
-    test "#merge! raises a PullRequest::NotReady if the PR isn't mergeable yet" do
+    test "#merge! raises a MergeRequest::NotReady if the PR isn't mergeable yet" do
       @pr.update!(mergeable: nil)
 
       assert_predicate @pr, :not_mergeable_yet?
-      assert_raises PullRequest::NotReady do
+      assert_raises MergeRequest::NotReady do
         @pr.merge!
       end
       @pr.reload
@@ -233,9 +248,9 @@ module Shipit
       end
       params = job.arguments.first
       assert_equal 'merge', params[:event]
-      assert_json 'status', 'rejected', document: params[:payload]
-      assert_json 'pull_request.rejection_reason', 'merge_conflict', document: params[:payload]
-      assert_json 'pull_request.number', @pr.number, document: params[:payload]
+      assert_json_document params[:payload], 'status', 'rejected'
+      assert_json_document params[:payload], 'merge_request.rejection_reason', 'merge_conflict'
+      assert_json_document params[:payload], 'merge_request.number', @pr.number
     end
 
     test "#merge! doesnt delete the branch if there are open PRs against it" do

data/test/models/pull_request_assignment_test.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Shipit
+  class PullRequestAssignmentTest < ActiveSupport::TestCase
+    setup do
+      @assignment = shipit_pull_request_assignments(:walrus_shopify_developers)
+    end
+
+    test "no duplicates are accepted" do
+      assignment = PullRequestAssignment.new(user: @assignment.user, pull_request: @assignment.pull_request)
+      refute assignment.valid?
+    end
+  end
+end

data/test/models/shipit/check_run_test.rb

@@ -9,13 +9,130 @@ module Shipit
       @check_run = shipit_check_runs(:second_pending_travis)
     end
 
+    test ".create_or_update_from_github! updates successfully" do
+      completed_at = Time.now
+      assert_difference -> { @commit.check_runs.count }, +1 do
+        @commit.check_runs.create_or_update_from_github!(
+          @stack.id,
+          github_check_run(conclusion: nil, completed_at: '2021-04-29T18:05:12Z')
+        )
+      end
+
+      assert_no_enqueued_jobs(only: RefreshCheckRunsJob) do
+        @commit.check_runs.create_or_update_from_github!(
+          @stack.id,
+          github_check_run(conclusion: 'success', completed_at: completed_at + 1.minute)
+        )
+      end
+
+      assert_equal 'success', @commit.check_runs.last.conclusion
+    end
+
+    test ".create_or_update_from_github! updates successfully using latest timestamp" do
+      completed_at = Time.now
+      assert_difference -> { @commit.check_runs.count }, +1 do
+        @commit.check_runs.create_or_update_from_github!(
+          @stack.id,
+          github_check_run(conclusion: 'success', completed_at: completed_at)
+        )
+      end
+
+      assert_enqueued_with(job: RefreshCheckRunsJob) do
+        @commit.check_runs.create_or_update_from_github!(
+          @stack.id,
+          github_check_run(conclusion: nil, completed_at: completed_at)
+        )
+      end
+
+      # RefreshCheckRunsJob would enqueue if the timestamp was older/equivalent
+      assert_no_enqueued_jobs(only: RefreshCheckRunsJob) do
+        @commit.check_runs.create_or_update_from_github!(
+          @stack.id,
+          github_check_run(
+            conclusion: 'action_required',
+            completed_at: completed_at,
+            started_at: completed_at + 1.minute,
+          ),
+        )
+      end
+
+      assert_equal 'action_required', @commit.check_runs.last.conclusion
+    end
+
     test ".create_or_update_from_github! is idempotent" do
+      completed_at = Time.now
+      assert_difference -> { @commit.check_runs.count }, +1 do
+        @commit.check_runs.create_or_update_from_github!(@stack.id, github_check_run(completed_at: completed_at))
+      end
+
+      assert_no_difference -> { @commit.check_runs.count } do
+        assert_no_enqueued_jobs(only: RefreshCheckRunsJob) do
+          @commit.check_runs.create_or_update_from_github!(@stack.id, github_check_run(completed_at: completed_at))
+        end
+      end
+    end
+
+    test ".create_or_update_from_github! enqueues refresh and updates record when new statuses have stale timestamps" do
+      completed_at = Time.now
       assert_difference -> { @commit.check_runs.count }, +1 do
-        @commit.check_runs.create_or_update_from_github!(@stack.id, github_check_run)
+        @commit.check_runs.create_or_update_from_github!(
+          @stack.id,
+          github_check_run(conclusion: 'success', completed_at: completed_at)
+        )
+      end
+
+      assert_equal 'success', @commit.check_runs.last.conclusion
+
+      updated_conclusion = 'action_required'
+      updated_check_run = github_check_run(conclusion: updated_conclusion, completed_at: completed_at - 1.minute)
+
+      assert_no_difference -> { @commit.check_runs.count } do
+        assert_enqueued_with(job: RefreshCheckRunsJob) do
+          @commit.check_runs.create_or_update_from_github!(@stack.id, updated_check_run)
+        end
+      end
+
+      assert_equal updated_conclusion, @commit.check_runs.last.conclusion
+
+      # If the refresh returns the same data, then the record should end up the same, but no refresh should be necessary
+      assert_no_difference -> { @commit.check_runs.count } do
+        assert_no_enqueued_jobs(only: RefreshCheckRunsJob) do
+          @commit.check_runs.create_or_update_from_github!(@stack.id, updated_check_run)
+        end
       end
 
+      assert_equal updated_conclusion, @commit.check_runs.last.conclusion
+    end
+
+    test ".create_or_update_from_github! does not enqueues refresh when old statuses has no timestamp" do
+      completed_at = Time.now
+      assert_difference -> { @commit.check_runs.count }, +1 do
+        @commit.check_runs.create_or_update_from_github!(
+          @stack.id,
+          github_check_run(conclusion: 'success', completed_at: completed_at)
+        )
+      end
+
+      @commit.check_runs.last.update!(github_updated_at: nil)
+
+      assert_no_difference -> { @commit.check_runs.count } do
+        assert_no_enqueued_jobs(only: RefreshCheckRunsJob) do
+          @commit.check_runs.create_or_update_from_github!(
+            @stack.id,
+            github_check_run(conclusion: nil, completed_at: completed_at - 1.minute)
+          )
+        end
+      end
+    end
+
+    test ".create_or_update_from_github! enqueues refresh when new statuses have no timestamps" do
       assert_no_difference -> { @commit.check_runs.count } do
-        @commit.check_runs.create_or_update_from_github!(@stack.id, github_check_run)
+        assert_enqueued_with(job: RefreshCheckRunsJob, args: [stack_id: @stack.id]) do
+          @commit.check_runs.create_or_update_from_github!(
+            @stack.id,
+            github_check_run(conclusion: nil, completed_at: nil, started_at: nil)
+          )
+        end
       end
     end
 
@@ -36,16 +153,18 @@ module Shipit
 
     private
 
-    def github_check_run
-      @github_check_run ||= OpenStruct.new(
+    def github_check_run(conclusion: 'success', completed_at: Time.now, started_at: Time.now - 1.minute)
+      OpenStruct.new(
         id: 424_242,
-        conclusion: 'success',
+        conclusion: conclusion,
         output: OpenStruct.new(
           description: 'This is a description',
         ),
         name: 'Test Suite',
         html_url: 'http://example.com/run',
         details_url: 'http://example.com/details',
+        completed_at: completed_at,
+        started_at: started_at,
       )
     end
   end

data/test/models/shipit/provisioning_handler/base_test.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Shipit
+  module ProvisioningHandler
+    class BaseTest < ActiveSupport::TestCase
+      test "provides a default #up handler" do
+        assert(
+          handler.respond_to?(:up),
+          "expected #{handler.class.name} to provide a default #up handler"
+        )
+      end
+
+      test "provides a default #down handler" do
+        assert(
+          handler.respond_to?(:down),
+          "expected #{handler.class.name} to provide a default #down handler"
+        )
+      end
+
+      test "provides a default #provision? handler" do
+        assert_equal true, handler.provision?
+      end
+
+      private
+
+      def handler
+        ProvisioningHandler::Base.new(mock("Stack"))
+      end
+    end
+  end
+end

data/test/models/shipit/provisioning_handler/unregistered_provisioning_handler_test.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Shipit
+  module ProvisioningHandler
+    class UnregisteredProvisioningHandlerTest < ActiveSupport::TestCase
+      test "#up stops transitions" do
+        stack = shipit_stacks(:shipit)
+        stack.update(provision_status: :deprovisioned)
+
+        assert_throws :halt do
+          UnregisteredProvisioningHandler.new(stack).up
+        end
+      end
+
+      test "#up locks the stack" do
+        stack = shipit_stacks(:shipit)
+        stack.update(provision_status: :deprovisioned)
+
+        assert_changes -> { stack.locked? }, from: false, to: true do
+          catch :halt do
+            UnregisteredProvisioningHandler.new(stack).up
+          end
+        end
+      end
+
+      test "#down stops transitions" do
+        stack = shipit_stacks(:shipit)
+        stack.update(provision_status: :deprovisioned)
+
+        assert_throws :halt do
+          UnregisteredProvisioningHandler.new(stack).down
+        end
+      end
+
+      test "#down prevents transitions" do
+        stack = shipit_stacks(:shipit)
+        stack.update(provision_status: :deprovisioned)
+
+        assert_changes -> { stack.locked? }, from: false, to: true do
+          catch :halt do
+            UnregisteredProvisioningHandler.new(stack).down
+          end
+        end
+      end
+    end
+  end
+end