shipit-engine 0.29.0 → 0.30.0

data/test/models/commits_test.rb

@@ -96,6 +96,14 @@ module Shipit
       assert_equal shipit_users(:walrus), commit.author
     end
 
+    test "#message= truncates the message" do
+      skip unless Shipit::Commit.columns_hash['message'].limit
+      limit = Shipit::Commit.columns_hash['message'].limit
+
+      @commit.update!(message: 'a' * limit * 2)
+      assert_equal limit, @commit.message.size
+    end
+
     test "#pull_request? detect pull request based on message format" do
       assert @pr.pull_request?
       refute @commit.pull_request?
@@ -190,12 +198,14 @@ module Shipit
         committed_at: Time.now,
       )
 
-      @stack.deploys.create!(
+      deploy = @stack.deploys.build(
         user_id: walrus.id,
         since_commit: @stack.commits.first,
         until_commit: new_commit,
         status: 'success',
       )
+      deploy.stubs(:pull_request_head_for_commit).returns(nil)
+      deploy.save!
 
       assert_no_difference "Deploy.count" do
         @commit.statuses.create!(stack_id: @stack.id, state: 'success')
@@ -248,7 +258,7 @@ module Shipit
         target_url: 'http://example.com',
         created_at: 1.day.ago,
       )
-      Shipit.github.api.expects(:statuses).with(@stack.github_repo_name, @commit.sha).returns([status])
+      Shipit.github.api.expects(:statuses).with(@stack.github_repo_name, @commit.sha, per_page: 100).returns([status])
       assert_difference '@commit.statuses.count', 1 do
         @commit.refresh_statuses!
       end
@@ -773,6 +783,16 @@ module Shipit
       assert_equal commit.deploy_requested_at, commit.created_at
     end
 
+    test "#recently_pushed?" do
+      freeze_time do
+        commit = Commit.new(message: "abcd", created_at: Time.now.utc)
+        assert_predicate commit, :recently_pushed?
+
+        commit = Commit.new(message: "abcd", created_at: 10.minutes.ago)
+        refute_predicate commit, :recently_pushed?
+      end
+    end
+
     private
 
     def expect_event(stack)

data/test/models/deploy_stats_test.rb

@@ -0,0 +1,112 @@
+require 'test_helper'
+
+module Shipit
+  class DeployStatsTest < ActiveSupport::TestCase
+    def setup
+      @stack = shipit_stacks(:shipit_stats)
+      @stats = Shipit::DeployStats.new(@stack.deploys.not_active)
+      @old_deploys = @stack.deploys.not_active.where(created_at: 62.minutes.ago..32.minutes.ago)
+      @new_deploys = @stack.deploys.not_active.where("created_at > ?", 32.minutes.ago)
+    end
+
+    test "#average_duration is accurate" do
+      assert_equal 225.0, @stats.average_duration
+    end
+
+    test "#median_duration is accurate" do
+      assert_equal 210.0, @stats.median_duration
+    end
+
+    test "#max_duration is accurate" do
+      assert_equal 360.0, @stats.max_duration
+    end
+
+    test "#min_duration is accurate" do
+      assert_equal 120.0, @stats.min_duration
+    end
+
+    test "#success_rate is accurate" do
+      assert_equal 75.0, @stats.success_rate
+    end
+
+    test "#average_duration handles empty deploy data" do
+      stats = Shipit::DeployStats.new([])
+      assert_nil stats.average_duration
+    end
+
+    test "#median_duration handles empty deploy data" do
+      stats = Shipit::DeployStats.new([])
+      assert_nil stats.median_duration
+    end
+
+    test "#max_duration handles empty deploy data" do
+      stats = Shipit::DeployStats.new([])
+      assert_nil stats.max_duration
+    end
+
+    test "#min_duration handles empty deploy data" do
+      stats = Shipit::DeployStats.new([])
+      assert_nil stats.min_duration
+    end
+
+    test "#success_rate handles empty deploy data" do
+      stats = Shipit::DeployStats.new([])
+      assert_nil stats.success_rate
+    end
+
+    test "#compare count handles empty compare count" do
+      comparison = Shipit::DeployStats.new([])
+      results = @stats.compare(comparison)
+      assert_equal 400, results[:count]
+    end
+
+    test "#compare average and median handles empty array" do
+      comparison = Shipit::DeployStats.new([])
+      results = @stats.compare(comparison)
+      assert_nil results[:average_duration]
+      assert_nil results[:median_duration]
+    end
+
+    test "#compare average is accurate when negative" do
+      new_data = Shipit::DeployStats.new(@new_deploys)
+      old_data = Shipit::DeployStats.new(@old_deploys)
+      results = new_data.compare(old_data)
+      assert_equal(-53.84615384615385, results[:average_duration])
+    end
+
+    test "#compare median is accurate when negative" do
+      new_data = Shipit::DeployStats.new(@new_deploys)
+      old_data = Shipit::DeployStats.new(@old_deploys)
+      results = new_data.compare(old_data)
+      assert_equal(-50, results[:median_duration])
+    end
+
+    test "#compare count is accurate when negative" do
+      new_data = Shipit::DeployStats.new(@new_deploys)
+      old_data = Shipit::DeployStats.new(@old_deploys)
+      results = new_data.compare(old_data)
+      assert_equal(-66.66666666666666, results[:count])
+    end
+
+    test "#compare average is accurate" do
+      old_data = Shipit::DeployStats.new(@new_deploys)
+      new_data = Shipit::DeployStats.new(@old_deploys)
+      results = new_data.compare(old_data)
+      assert_equal(116.66666666666667, results[:average_duration])
+    end
+
+    test "#compare median is accurate" do
+      old_data = Shipit::DeployStats.new(@new_deploys)
+      new_data = Shipit::DeployStats.new(@old_deploys)
+      results = new_data.compare(old_data)
+      assert_equal(100, results[:median_duration])
+    end
+
+    test "#compare count is accurate" do
+      old_data = Shipit::DeployStats.new(@new_deploys)
+      new_data = Shipit::DeployStats.new(@old_deploys)
+      results = new_data.compare(old_data)
+      assert_equal(200, results[:count])
+    end
+  end
+end

data/test/models/deploys_test.rb

@@ -199,6 +199,7 @@ module Shipit
         since_commit: shipit.commits.first,
         until_commit: shipit.commits.last,
       )
+      deploy.stubs(:pull_request_head_for_commit).returns(nil)
 
       expect_event(deploy)
       deploy.save!
@@ -300,18 +301,6 @@ module Shipit
       end
     end
 
-    test "creating a deploy creates one CommitDeployment per commit" do
-      shipit = shipit_stacks(:shipit)
-      deploy = shipit.deploys.build(
-        since_commit: shipit.commits.first,
-        until_commit: shipit.commits.last,
-      )
-
-      assert_difference -> { CommitDeployment.count }, deploy.commits.size do
-        deploy.save!
-      end
-    end
-
     test "#build_rollback returns an unsaved record" do
       assert @deploy.build_rollback.new_record?
     end
@@ -338,10 +327,9 @@ module Shipit
       assert_equal shipit_commits(:second), @stack.last_deployed_commit
     end
 
-    def create_test_stack
+    def create_test_stack(repository: Shipit::Repository.find_or_create_by!(owner: "shopify-test", name: "shipit-engine-test"))
       Shipit::Stack.create(
-        repo_owner: "shopify-test",
-        repo_name: "shipit-engine-test",
+        repository: repository,
         environment: 'production',
         branch: "master",
         merge_queue_enabled: true,
@@ -552,8 +540,7 @@ module Shipit
       user_id = @user.id
       test_stack = create_test_stack
       test_stack.save
-      other_stack = create_test_stack
-      other_stack.repo_name += "_other"
+      other_stack = create_test_stack(repository: Shipit::Repository.create!(owner: "_", name: "_some-other-repository"))
       other_stack.save
       other_stack.reload
       stack_id = test_stack.id
@@ -860,6 +847,57 @@ module Shipit
       end
     end
 
+    test "succeeding a deploy creates CommitDeploymentStatuses" do
+      @deploy = shipit_deploys(:shipit_running)
+      refute_empty @deploy.commit_deployments
+
+      assert_difference -> { CommitDeploymentStatus.count }, @deploy.commit_deployments.size do
+        @deploy.report_complete!
+      end
+
+      assert_equal 'success', CommitDeploymentStatus.last.status
+    end
+
+    test "creates one CommitDeployment and status per commit, and one more for the batch head" do
+      template_task = shipit_tasks(:shipit_pending)
+      deploy = template_task.stack.deploys.build(
+        since_commit: template_task.since_commit,
+        until_commit: template_task.until_commit,
+      )
+
+      pull_request_response = stub(head: stub(sha: '6dcb09b5b57875f334f61aebed695e2e4193db5e'))
+      Shipit.github.api.expects(:pull_request).with('shopify/shipit-engine', 7).returns(pull_request_response)
+
+      expected_delta = deploy.commits.select(&:pull_request?).size + 1
+      assert_difference -> { CommitDeployment.count }, expected_delta do
+        assert_difference -> { CommitDeploymentStatus.count }, expected_delta do
+          deploy.save!
+        end
+      end
+
+      refute_nil CommitDeployment.find_by(sha: '6dcb09b5b57875f334f61aebed695e2e4193db5e')
+      refute_nil CommitDeployment.find_by(sha: deploy.until_commit.sha)
+    end
+
+    test "#create_commit_deployments handles API errors when loading pull request details" do
+      template_task = shipit_tasks(:shipit_pending)
+      deploy = template_task.stack.deploys.build(
+        since_commit: template_task.since_commit,
+        until_commit: template_task.until_commit,
+      )
+
+      Shipit.github.api.expects(:pull_request).with('shopify/shipit-engine', 7).raises(Octokit::NotFound)
+
+      expected_delta = 1 # Only the batch head
+      assert_difference -> { CommitDeployment.count }, expected_delta do
+        assert_difference -> { CommitDeploymentStatus.count }, expected_delta do
+          deploy.save!
+        end
+      end
+
+      refute_nil CommitDeployment.find_by(sha: deploy.until_commit.sha)
+    end
+
     private
 
     def expect_event(deploy)

data/test/models/pull_request_test.rb

@@ -116,7 +116,7 @@ module Shipit
         )
       end
 
-      Shipit.github.api.expects(:statuses).with(@stack.github_repo_name, head_sha).returns([stub(
+      Shipit.github.api.expects(:statuses).with(@stack.github_repo_name, head_sha, per_page: 100).returns([stub(
         state: 'success',
         description: nil,
         context: 'default',

data/test/models/shipit/repository_test.rb

@@ -0,0 +1,76 @@
+require 'test_helper'
+
+module Shipit
+  class RepositoryTest < ActiveSupport::TestCase
+    setup do
+      @repository = shipit_repositories(:shipit)
+    end
+
+    test "owner, and name uniqueness is enforced" do
+      clone = Repository.new(@repository.attributes.except('id'))
+      refute clone.save
+      assert_equal ["cannot be used more than once"], clone.errors[:name]
+    end
+
+    test "owner, name, and environment can only be ASCII" do
+      @repository.update(owner: 'héllò', name: 'wørld')
+      refute_predicate @repository, :valid?
+    end
+
+    test "owner and name are case insensitive" do
+      assert_no_difference -> { Repository.count } do
+        error = assert_raises ActiveRecord::RecordInvalid do
+          Repository.create!(
+            owner: @repository.owner.upcase,
+            name: @repository.name.upcase,
+          )
+        end
+        assert_equal 'Validation failed: Name cannot be used more than once', error.message
+      end
+
+      new_repository = Repository.create!(owner: 'FOO', name: 'BAR')
+      assert_equal new_repository, Repository.find_by(owner: 'foo', name: 'bar')
+    end
+
+    test "owner is automatically downcased" do
+      @repository.owner = 'George'
+      assert_equal 'george', @repository.owner
+    end
+
+    test "name is automatically downcased" do
+      @repository.name = 'Cyclim.se'
+      assert_equal 'cyclim.se', @repository.name
+    end
+
+    test "owner cannot contain a `/`" do
+      assert @repository.valid?
+      @repository.owner = 'foo/bar'
+      refute @repository.valid?
+    end
+
+    test "name cannot contain a `/`" do
+      assert @repository.valid?
+      @repository.name = 'foo/bar'
+      refute @repository.valid?
+    end
+
+    test "http_url" do
+      assert_equal "https://github.com/#{@repository.owner}/#{@repository.name}", @repository.http_url
+    end
+
+    test "git_url" do
+      assert_equal "https://github.com/#{@repository.owner}/#{@repository.name}.git", @repository.git_url
+    end
+
+    test "from_github_repo_name" do
+      owner = "repository-owner"
+      name = "repository-name"
+      github_repo_name = [owner, name].join("/")
+      expected_repository = Repository.create(owner: owner, name: name)
+
+      found_repository = Repository.from_github_repo_name(github_repo_name)
+
+      assert_equal(expected_repository, found_repository)
+    end
+  end
+end

data/test/models/shipit/wehbooks/handlers_test.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+module Shipit
+  module Webhooks
+    class HandlersTest < ActiveSupport::TestCase
+      test 'custom handlers do not replace default shipit handlers' do
+        event = 'push'
+        mock_handler = mock
+        Shipit::Webhooks.register_handler(event, mock_handler)
+
+        assert_includes Shipit::Webhooks.for_event(event), mock_handler
+        assert_includes Shipit::Webhooks.for_event(event), Shipit::Webhooks::Handlers::PushHandler
+
+        Shipit::Webhooks.reset_handlers!
+      end
+
+      test "unknown events have no handlers" do
+        event = '_'
+
+        handlers = Shipit::Webhooks.for_event(event)
+
+        assert_equal [], handlers
+      end
+    end
+  end
+end

data/test/models/stacks_test.rb

@@ -9,43 +9,6 @@ module Shipit
       GithubHook.any_instance.stubs(:teardown!)
     end
 
-    test "repo_owner, repo_name and environment uniqueness is enforced" do
-      clone = Stack.new(@stack.attributes.except('id'))
-      refute clone.save
-      assert_equal ["cannot be used more than once with this environment"], clone.errors[:repo_name]
-    end
-
-    test "repo_owner, repo_name, and environment can only be ASCII" do
-      @stack.update(repo_owner: 'héllò', repo_name: 'wørld', environment: 'pródüctïòn')
-      refute_predicate @stack, :valid?
-    end
-
-    test "repo_owner and repo_name are case insensitive" do
-      assert_no_difference -> { Stack.count } do
-        error = assert_raises ActiveRecord::RecordInvalid do
-          Stack.create!(
-            repo_owner: @stack.repo_owner.upcase,
-            repo_name: @stack.repo_name.upcase,
-            environment: @stack.environment,
-          )
-        end
-        assert_equal 'Validation failed: Repo name cannot be used more than once with this environment', error.message
-      end
-
-      new_stack = Stack.create!(repo_owner: 'FOO', repo_name: 'BAR')
-      assert_equal new_stack, Stack.find_by(repo_owner: 'foo', repo_name: 'bar')
-    end
-
-    test "repo_owner is automatically downcased" do
-      @stack.repo_owner = 'George'
-      assert_equal 'george', @stack.repo_owner
-    end
-
-    test "repo_name is automatically downcased" do
-      @stack.repo_name = 'Cyclim.se'
-      assert_equal 'cyclim.se', @stack.repo_name
-    end
-
     test "branch defaults to master" do
       @stack.branch = ""
       assert @stack.save
@@ -64,18 +27,6 @@ module Shipit
       assert_equal 'foo:bar', @stack.environment
     end
 
-    test "repo_owner cannot contain a `/`" do
-      assert @stack.valid?
-      @stack.repo_owner = 'foo/bar'
-      refute @stack.valid?
-    end
-
-    test "repo_name cannot contain a `/`" do
-      assert @stack.valid?
-      @stack.repo_name = 'foo/bar'
-      refute @stack.valid?
-    end
-
     test "repo_http_url" do
       assert_equal "https://github.com/#{@stack.repo_owner}/#{@stack.repo_name}", @stack.repo_http_url
     end
@@ -104,6 +55,30 @@ module Shipit
       assert_equal shipit_deploys(:shipit_complete).until_commit_id, deploy.since_commit_id
     end
 
+    test "#trigger_deploy emits a hook" do
+      original_receivers = Shipit.internal_hook_receivers
+
+      FakeReceiver = Module.new do
+        mattr_accessor :hooks
+        self.hooks = []
+
+        def self.deliver(event, stack, payload)
+          hooks << [event, stack, payload]
+        end
+      end
+      Shipit.internal_hook_receivers = [FakeReceiver]
+
+      last_commit = shipit_commits(:third)
+      deploy = @stack.trigger_deploy(last_commit, AnonymousUser.new)
+      assert_includes FakeReceiver.hooks, [
+        :deploy,
+        @stack,
+        {deploy: deploy, status: "pending", stack: @stack},
+      ]
+    ensure
+      Shipit.internal_hook_receivers = original_receivers
+    end
+
     test "#trigger_deploy deploy until the commit passed in argument" do
       last_commit = shipit_commits(:third)
       deploy = @stack.trigger_deploy(last_commit, AnonymousUser.new)
@@ -225,7 +200,7 @@ module Shipit
 
     test "#create queues a GithubSyncJob" do
       assert_enqueued_with(job: GithubSyncJob) do
-        Stack.create!(repo_name: 'rails', repo_owner: 'rails')
+        Stack.create!(repository: shipit_repositories(:rails))
       end
     end
 
@@ -273,7 +248,10 @@ module Shipit
     end
 
     test ".run_deploy_in_foreground triggers a deploy" do
-      stack = Stack.create!(repo_owner: 'foo', repo_name: 'bar', environment: 'production')
+      stack = Stack.create!(
+        repository: Repository.new(owner: "foo", name: "bar"),
+        environment: 'production',
+      )
       commit = shipit_commits(:first)
       stack.commits << commit
 
@@ -870,6 +848,21 @@ module Shipit
       )
     end
 
+    test "#trigger_continuous_delivery sets delay if commit was pushed recently" do
+      freeze_time do
+        @stack.tasks.delete_all
+
+        commit = @stack.next_commit_to_deploy
+        commit.touch(:created_at)
+
+        assert_no_enqueued_jobs(only: Shipit::PerformTaskJob) do
+          assert_no_difference -> { Deploy.count } do
+            @stack.trigger_continuous_delivery
+          end
+        end
+      end
+    end
+
     private
 
     def generate_revert_commit(stack:, reverted_commit:, author: reverted_commit.author)