shipit-engine 0.24.0 → 0.25.0

data/test/jobs/append_delayed_release_status_job_test.rb

@@ -0,0 +1,25 @@
+require 'test_helper'
+
+module Shipit
+  class AppendDelayedReleaseStatusJobTest < ActiveSupport::TestCase
+    setup do
+      @job = AppendDelayedReleaseStatusJob.new
+      @deploy = shipit_deploys(:shipit_complete)
+    end
+
+    test "#perform bails out if another status was appended in the meantime" do
+      cursor = @deploy.last_release_status
+      @deploy.append_release_status(cursor.state, 'Something else happened')
+      assert_no_difference -> { ReleaseStatus.count } do
+        @job.perform(@deploy, cursor: cursor, status: 'success', description: 'Nothing happened')
+      end
+    end
+
+    test "#perform appends the new status if no other status was appended in the meantime" do
+      cursor = @deploy.last_release_status
+      assert_difference -> { ReleaseStatus.count }, +1 do
+        @job.perform(@deploy, cursor: cursor, status: 'success', description: 'Something happened')
+      end
+    end
+  end
+end

data/test/jobs/cache_deploy_spec_job_test.rb

@@ -1,11 +1,10 @@
 require 'test_helper'
-require 'tmpdir'
 
 module Shipit
   class CacheDeploySpecJobTest < ActiveSupport::TestCase
     setup do
       @stack = shipit_stacks(:shipit)
-      @last_commit = shipit_commits(:fifth)
+      @last_commit = @stack.commits.last
       @job = CacheDeploySpecJob.new
     end
 

data/test/jobs/emit_event_job_test.rb

@@ -8,7 +8,7 @@ module Shipit
     end
 
     test "#perform schedule deliveries" do
-      assert_difference -> { Delivery.scheduled.count }, 2 do
+      assert_enqueued_jobs(2, only: DeliverHookJob) do
         @job.perform(event: :deploy, stack_id: @stack.id, payload: {foo: 42}.to_json)
       end
     end

data/test/jobs/github_sync_job_test.rb

@@ -40,6 +40,7 @@ module Shipit
       @stack.deploys_and_rollbacks.destroy_all
 
       initial_queue = [
+        ["whoami", false],
         ["fix all the things", false],
         ["yoloshipit!", false],
         ["fix it!", false],

data/test/models/commits_test.rb

@@ -10,6 +10,59 @@ module Shipit
       @commit = shipit_commits(:first)
     end
 
+    test '.create_from_github handle unknown users' do
+      assert_difference -> { Commit.count }, +1 do
+        @stack.commits.create_from_github!(
+          resource(
+            sha: '2adaad1ad30c235d3a6e7981dfc1742f7ecb1e85',
+            author: {},
+            committer: {},
+            commit: {
+              author: {
+                name: 'George Abitbol',
+                email: '',
+                date: Time.now,
+              },
+              committer: {
+                name: 'George Abitbol',
+                email: '',
+                date: Time.now,
+              },
+              message: "commit to trigger staging build",
+            },
+          ),
+        )
+      end
+    end
+
+    test '.create_from_github handle PRs merged by another Shipit stacks' do
+      assert_difference -> { Commit.count }, +1 do
+        @stack.commits.create_from_github!(
+          resource(
+            sha: '2adaad1ad30c235d3a6e7981dfc1742f7ecb1e85',
+            author: {},
+            committer: {},
+            commit: {
+              author: {
+                name: 'Shipit',
+                email: '',
+                date: Time.now,
+              },
+              committer: {
+                name: 'Shipit',
+                email: '',
+                date: Time.now,
+              },
+              message: "commit to trigger staging build\n\nMerge-Requested-By: walrus\n",
+            },
+          ),
+        )
+      end
+
+      commit = Commit.last
+      assert_equal shipit_users(:walrus), commit.author
+    end
+
     test "#pull_request? detect pull request based on message format" do
       assert @pr.pull_request?
       refute @commit.pull_request?
@@ -181,7 +234,7 @@ module Shipit
         message: "more fish!",
       )
       @stack.reload
-      assert_equal 2, @stack.undeployed_commits_count
+      assert_equal 3, @stack.undeployed_commits_count
     end
 
     test "fetch_stats! pulls additions and deletions from github" do

data/test/models/deploy_spec_test.rb

@@ -63,11 +63,11 @@ module Shipit
     test '#bundle_install return a sane default bundle install command' do
       @spec.stubs(:gemfile_lock_exists?).returns(true)
       command = %(
-        bundle check --path=#{DeploySpec.bundle_path} ||
         bundle install
         --frozen
-        --path=#{DeploySpec.bundle_path}
-        --retry=2
+        --jobs 4
+        --path #{DeploySpec.bundle_path}
+        --retry 2
         --without=default:production:development:test:staging:benchmark:debug
       ).gsub(/\s+/, ' ').strip
       assert_equal command, @spec.bundle_install.last
@@ -77,11 +77,11 @@ module Shipit
       @spec.stubs(:gemfile_lock_exists?).returns(true)
       @spec.stubs(:load_config).returns('dependencies' => {'bundler' => {'without' => %w(some custom groups)}})
       command = %(
-        bundle check --path=#{DeploySpec.bundle_path} ||
         bundle install
         --frozen
-        --path=#{DeploySpec.bundle_path}
-        --retry=2
+        --jobs 4
+        --path #{DeploySpec.bundle_path}
+        --retry 2
         --without=some:custom:groups
       ).gsub(/\s+/, ' ').strip
       assert_equal command, @spec.bundle_install.last
@@ -307,11 +307,24 @@ module Shipit
           'require' => [],
           'blocking' => [],
         },
-        'machine' => {'environment' => {}, 'directory' => nil, 'cleanup' => true},
+        'machine' => {
+          'environment' => {'BUNDLE_PATH' => @spec.bundle_path.to_s},
+          'directory' => nil,
+          'cleanup' => true,
+        },
         'review' => {'checklist' => [], 'monitoring' => [], 'checks' => []},
+        'status' => {
+          'context' => nil,
+          'delay' => nil,
+        },
         'dependencies' => {'override' => []},
         'plugins' => {},
-        'deploy' => {'override' => nil, 'variables' => [], 'max_commits' => 8, 'interval' => 0},
+        'deploy' => {
+          'override' => nil,
+          'variables' => [],
+          'max_commits' => 8,
+          'interval' => 0,
+        },
         'rollback' => {'override' => nil},
         'fetch' => nil,
         'tasks' => {},
@@ -350,9 +363,59 @@ module Shipit
       assert_equal ['foo'], definition.steps
     end
 
-    test "#task_definitions returns kubernetes commands as well as comands from the config" do
+    test "#task_definitions will always have definitions from shipit.yml take precedence over other modules" do
+      # Create a subclass of `FileSystem` which we can include another module in without
+      # affecting any other tests
+      DuplicateCustomizedDeploySpec = Class.new(Shipit::DeploySpec::FileSystem)
+
+      # Create the module we want to include in our new class
+      # For this test case, we want to have the module create a task with the same
+      # ID as defined from config
+      module TestTaskDiscovery
+        def discover_task_definitions
+          {
+            'config_task' => {'steps' => %w(bar)},
+          }.merge!(super)
+        end
+      end
+
+      # Include the module in our new test class
+      DuplicateCustomizedDeploySpec.include TestTaskDiscovery
+
+      # Setup the spec as we would normally, but use the customized version
+      @spec = DuplicateCustomizedDeploySpec.new(@app_dir, 'env')
+      @spec.stubs(:load_config).returns(
+        'tasks' => {'config_task' => {'steps' => %w(foo)}},
+      )
+      tasks = @spec.task_definitions
+
+      # Assert we get only the task from the config, not from the module
+      assert_equal %w(config_task), tasks.map(&:id)
+      assert_equal ["foo"], tasks.first.steps
+    end
+
+    test "#task_definitions returns comands from the config and other modules" do
+      # Create a subclass of `FileSystem` which we can include another module in without
+      # affecting any other tests
+      CustomizedDeploySpec = Class.new(Shipit::DeploySpec::FileSystem)
+
+      # Create the module we want to include in our new class
+      # This module demonstrates how to have new tasks to be appended to the task list
+      module TestTaskDiscovery
+        def discover_task_definitions
+          {
+            'module_task' => {'steps' => %w(bar)},
+          }.merge(super)
+        end
+      end
+
+      # Include the module in our new test class
+      CustomizedDeploySpec.include TestTaskDiscovery
+
+      # Setup the spec as we would normally, but use the customized version
+      @spec = CustomizedDeploySpec.new(@app_dir, 'env')
       @spec.stubs(:load_config).returns(
-        'tasks' => {'another_task' => {'steps' => %w(foo)}},
+        'tasks' => {'config_task' => {'steps' => %w(foo)}},
         'kubernetes' => {
           'namespace' => 'foo',
           'context' => 'bar',
@@ -360,7 +423,16 @@ module Shipit
         },
       )
       tasks = @spec.task_definitions
-      assert_equal 2, tasks.size
+
+      # Assert we get tasks from all three sources: config, shipit-engine defined modules, and
+      # "third party" modules
+      assert_equal %w(config_task module_task restart), tasks.map(&:id).sort
+
+      module_task = tasks.find { |t| t.id == "config_task" }
+      assert_equal ["foo"], module_task.steps
+
+      config_task = tasks.find { |t| t.id == "module_task" }
+      assert_equal ["bar"], config_task.steps
 
       restart_task = tasks.find { |t| t.id == "restart" }
       assert_equal ["kubernetes-restart foo bar --max-watch-seconds 1200"], restart_task.steps

data/test/models/deploys_test.rb

@@ -466,6 +466,58 @@ module Shipit
       assert_predicate @deploy, :alive?
     end
 
+    test "triggering a deploy sets the release status as pending" do
+      @commit = shipit_commits(:fifth)
+      assert_difference -> { ReleaseStatus.count }, +1 do
+        assert_equal 'unknown', @commit.last_release_status.state
+        @deploy = @stack.trigger_deploy(@commit, AnonymousUser.new)
+        assert_equal 'pending', @commit.last_release_status.state
+      end
+    end
+
+    test "failing a deploy sets the release status as error" do
+      @deploy = shipit_deploys(:shipit_running)
+      assert_difference -> { ReleaseStatus.count }, +1 do
+        assert_not_equal 'error', @deploy.last_release_status.state
+        @deploy.report_failure!(StandardError.new)
+        assert_equal 'error', @deploy.last_release_status.state
+      end
+    end
+
+    test "succeeding a deploy sets the release status as success if the status delay is 0s" do
+      @deploy = shipit_deploys(:shipit_running)
+      @deploy.stack.expects(:release_status_delay).returns(Duration.parse(0))
+
+      assert_difference -> { ReleaseStatus.count }, +1 do
+        assert_not_equal 'success', @deploy.last_release_status.state
+        @deploy.complete!
+        assert_equal 'success', @deploy.last_release_status.state
+      end
+    end
+
+    test "succeeding a deploy sets the release status as pending if the status delay is longer than 0s" do
+      @deploy = shipit_deploys(:shipit_running)
+      @deploy.stack.expects(:release_status_delay).returns(Duration.parse(1))
+
+      assert_difference -> { ReleaseStatus.count }, +1 do
+        assert_not_equal 'success', @deploy.last_release_status.state
+        assert_enqueued_with(job: AppendDelayedReleaseStatusJob) do
+          @deploy.complete!
+        end
+        assert_equal 'pending', @deploy.last_release_status.state
+      end
+    end
+
+    test "triggering a rollback sets the release status as failure" do
+      @deploy = shipit_deploys(:shipit_complete)
+
+      assert_difference -> { ReleaseStatus.count }, +1 do
+        assert_not_equal 'failure', @deploy.last_release_status.state
+        @deploy.trigger_rollback
+        assert_equal 'failure', @deploy.reload.last_release_status.state
+      end
+    end
+
     private
 
     def expect_event(deploy)

data/test/models/hook_test.rb

@@ -29,23 +29,10 @@ module Shipit
       assert_equal ["Events is not a strict subset of #{Hook::EVENTS.inspect}"], @hook.errors.full_messages
     end
 
-    test ".emit enqueues an EmitEventJob with the proper payload" do
-      assert_enqueued_with(job: EmitEventJob) do
-        Hook.emit(:deploy, @stack, foo: 42)
-      end
-    end
-
     test ".deliver schedules a delivery for each matching hook" do
-      assert_difference -> { Delivery.count }, 2 do
+      assert_enqueued_jobs(2, only: DeliverHookJob) do
         Hook.deliver(:deploy, @stack, 'foo' => 42)
       end
-
-      delivery = Delivery.last
-
-      assert_equal @hook.delivery_url, delivery.url
-      assert_equal 'application/x-www-form-urlencoded', delivery.content_type
-      assert_equal 'foo=42', delivery.payload
-      assert_equal 'scheduled', delivery.status
     end
 
     test ".scoped? returns true if the hook has a stack_id" do
@@ -55,19 +42,5 @@ module Shipit
       @hook.stack_id = 42
       assert @hook.scoped?
     end
-
-    test "#purge_old_deliveries!" do
-      Hook.deliver(:deploy, @stack, 'foo' => 42)
-      @hook.deliveries.update_all(status: 'sent')
-
-      previous_ids = @hook.deliveries.sent.order(id: :desc).pluck(:id)
-
-      assert_difference -> { @hook.deliveries.sent.count }, -1 do
-        @hook.purge_old_deliveries!(keep: 1)
-      end
-
-      after_ids = @hook.deliveries.sent.order(id: :desc).pluck(:id)
-      assert_equal previous_ids[0..-2], after_ids
-    end
   end
 end

data/test/models/pull_request_test.rb

@@ -183,6 +183,25 @@ module Shipit
       refute_predicate @pr, :rejected?
     end
 
+    test "#reject_unless_mergeable! reject the PR if it has a missing CI status" do
+      @pr.head.statuses.where(context: 'ci/circle').delete_all
+
+      assert_predicate @pr, :all_status_checks_passed?
+      refute_predicate @pr, :any_status_checks_failed?
+      assert_equal false, @pr.reject_unless_mergeable!
+      refute_predicate @pr, :rejected?
+    end
+
+    test "#reject_unless_mergeable! reject the PR if it has a missing CI status (multi-status)" do
+      @pr.head.statuses.where(context: 'ci/circle').delete_all
+      @pr.head.statuses.create!(stack: @pr.stack, state: 'success', context: 'ci/travis')
+
+      assert_predicate @pr, :all_status_checks_passed?
+      refute_predicate @pr, :any_status_checks_failed?
+      assert_equal false, @pr.reject_unless_mergeable!
+      refute_predicate @pr, :rejected?
+    end
+
     test "#reject_unless_mergeable! rejects the PR if it is stale" do
       @pr.stubs(:stale?).returns(true)
       assert_equal true, @pr.reject_unless_mergeable!

data/test/models/release_statuses_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+module Shipit
+  class ReleaseStatusesTest < ActiveSupport::TestCase
+    test "#create_status_on_github! calls GitHub API" do
+      Shipit.github.api.expects(:create_status).once.with(
+        'shopify/shipit-engine',
+        shipit_commits(:fourth).sha,
+        'pending',
+        context: 'shipit/production',
+        target_url: 'https://example.com/deploys/42',
+        description: 'Deploy started',
+      ).returns(resource(id: 42))
+
+      @status = shipit_release_statuses(:to_be_created)
+      assert_nil @status.github_id
+      @status.create_status_on_github!
+      assert_equal 42, @status.github_id
+    end
+
+    test "#create_status_on_github! does nothing if the github_id is alreayd recorded" do
+      Shipit.github.api.expects(:create_status).never
+
+      @status = shipit_release_statuses(:created)
+      @status.create_status_on_github!
+    end
+  end
+end

data/test/models/rollbacks_test.rb

@@ -36,6 +36,7 @@ module Shipit
 
       expected = [
         ['Revert "Merge pull request #7 from shipit-engine/yoloshipit"', false],
+        ["whoami", false],
         ['fix all the things', false],
       ]
       assert_equal expected, @stack.undeployed_commits.map { |c| [c.title, c.locked?] }
@@ -46,6 +47,7 @@ module Shipit
 
       expected = [
         ['Revert "Merge pull request #7 from shipit-engine/yoloshipit"', false],
+        ["whoami", true],
         ['fix all the things', true],
         ['yoloshipit!', true],
       ]

data/test/models/stacks_test.rb

@@ -354,7 +354,7 @@ module Shipit
 
     test "the git cache lock prevent concurrent access to the git cache" do
       @stack.acquire_git_cache_lock do
-        assert_raises Redis::Lock::LockTimeout do
+        assert_raises Flock::TimeoutError do
           @stack.acquire_git_cache_lock(timeout: 0.1) {}
         end
       end