shipit-engine 0.28.0 → 0.32.0

data/test/helpers/links_helper.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
 module LinksHelper
   LINKS_PATTERN = /\<(.*?)\>; rel="(\w+)"/
 
   def assert_link(rel, url)
-    assert_includes response_links, rel
-    assert_equal url, response_links[rel], %(rel="#{rel}" is incorrect)
+    assert_includes(response_links, rel)
+    assert_equal(url, response_links[rel], %(rel="#{rel}" is incorrect))
   end
 
   def assert_no_link(rel)
-    assert_nil response_links[rel], %(expected rel="#{rel}" to be nil)
+    assert_nil(response_links[rel], %(expected rel="#{rel}" to be nil))
   end
 
   private

data/test/helpers/payloads_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module PayloadsHelper
   def payload(name)
     Shipit::Engine.root.join('test/fixtures/payloads', "#{name}.json").read

data/test/helpers/queries_helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module QueriesHelper
   def assert_no_queries(ignored_sql = nil, &block)
     assert_queries(0, ignored_sql, &block)
@@ -8,7 +9,7 @@ module QueriesHelper
     subscriber = ActiveSupport::Notifications.subscribe('sql.active_record', counter)
     yield counter
     queries = counter.log.empty? ? '' : "\nQueries:\n#{counter.log.join("\n")}"
-    assert_equal num, counter.log.size, "#{counter.log.size} instead of #{num} queries were executed.#{queries}"
+    assert_equal(num, counter.log.size, "#{counter.log.size} instead of #{num} queries were executed.#{queries}")
   ensure
     ActiveSupport::Notifications.unsubscribe(subscriber)
   end
@@ -35,7 +36,7 @@ module QueriesHelper
 
     # FIXME: this needs to be refactored so specific database can add their own
     # ignored SQL.  This ignored SQL is for Oracle.
-    ignored_sql.concat [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im]
+    ignored_sql.concat([/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im])
 
     attr_reader :ignore
     attr_reader :log

data/test/jobs/cache_deploy_spec_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -9,7 +10,7 @@ module Shipit
     end
 
     test "#perform checkout the repository to the last recorded commit and cache the deploy spec" do
-      @stack.update!(cached_deploy_spec: DeploySpec.new('review' => {'checklist' => %w(foo bar)}))
+      @stack.update!(cached_deploy_spec: DeploySpec.new('review' => { 'checklist' => %w(foo bar) }))
 
       dir = Pathname(Dir.tmpdir)
       StackCommands.any_instance.expects(:with_temporary_working_directory).with(commit: @last_commit).yields(dir)

data/test/jobs/chunk_rollup_job_test.rb

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

data/test/jobs/deliver_hook_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -8,7 +9,7 @@ module Shipit
     end
 
     test "#perform delivers a delivery" do
-      FakeWeb.register_uri(:post, @delivery.url, body: 'OK')
+      stub_request(:post, @delivery.url).to_return(body: 'OK')
       @job.perform(@delivery)
       assert_equal 'sent', @delivery.reload.status
     end

data/test/jobs/destroy_stack_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -14,5 +15,14 @@ module Shipit
         @job.perform(@stack)
       end
     end
+
+    test "perform destroys the CommitDeployments of the received stack" do
+      stack = shipit_stacks(:shipit)
+      Shipit.legacy_github_api.stubs(:remove_hook)
+
+      assert_changes -> { CommitDeployment.count }, 'CommitDeployments not deleted' do
+        @job.perform(stack)
+      end
+    end
   end
 end

data/test/jobs/emit_event_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -9,7 +10,7 @@ module Shipit
 
     test "#perform schedule deliveries" do
       assert_enqueued_jobs(2, only: DeliverHookJob) do
-        @job.perform(event: :deploy, stack_id: @stack.id, payload: {foo: 42}.to_json)
+        @job.perform(event: :deploy, stack_id: @stack.id, payload: { foo: 42 }.to_json)
       end
     end
   end

data/test/jobs/fetch_commit_stats_job_test.rb

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

data/test/jobs/fetch_deployed_revision_job_test.rb

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

data/test/jobs/github_sync_job_test.rb

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

data/test/jobs/mark_deploy_healthy_job_test.rb

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

data/test/jobs/merge_pull_requests_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -17,15 +18,15 @@ module Shipit
 
     test "#perform rejects unmergeable PRs and merge the others" do
       PullRequest.any_instance.stubs(:refresh!)
-      FakeWeb.register_uri(:put, "#{@pending_pr.api_url}/merge", 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",
       }.to_json)
       branch_url = "https://api.github.com/repos/shopify/shipit-engine/git/refs/heads/feature-62"
-      FakeWeb.register_uri(:delete, branch_url, 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"
-      FakeWeb.register_uri(:get, pulls_url, status: %w(200 OK), body: '[]')
+      stub_request(:get, pulls_url).to_return(status: %w(200 OK), body: '[]')
 
       @job.perform(@stack)
 
@@ -35,7 +36,7 @@ module Shipit
 
     test "#perform rejects PRs if the merge attempt fails" do
       PullRequest.any_instance.stubs(:refresh!)
-      FakeWeb.register_uri(:put, "#{@pending_pr.api_url}/merge", 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",
       }.to_json)

data/test/jobs/perform_task_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -20,7 +21,7 @@ module Shipit
     test "#perform fetch commits from the API" do
       @job.stubs(:capture!)
       @job.stubs(:capture)
-      @commands = stub(:commands)
+      @commands = stub
       Commands.expects(:for).with(@deploy).returns(@commands)
 
       @commands.expects(:fetched?).once.returns(FakeSuccessfulCommand.new)
@@ -132,7 +133,7 @@ module Shipit
 
         @job.perform(@deploy)
 
-        assert_equal 'timedout', @deploy.reload.status
+        assert_equal('timedout', @deploy.reload.status)
       ensure
         Shipit.timeout_exit_codes = previous_exit_codes
       end
@@ -140,7 +141,7 @@ module Shipit
 
     test "records stack support for rollbacks and fetching deployed revision" do
       @job.stubs(:capture!)
-      @commands = stub(:commands)
+      @commands = stub
       @commands.stubs(:fetched?).returns([])
       @commands.stubs(:fetch).returns([])
       @commands.stubs(:clone).returns([])

data/test/jobs/purge_old_deliveries_job_test.rb

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

data/test/jobs/reap_dead_tasks_job_test.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+require 'test_helper'
+
+module Shipit
+  class ReapDeadTasksJobTest < ActiveSupport::TestCase
+    setup do
+      Task.where(status: Task::ACTIVE_STATUSES).update_all(status: 'success')
+
+      not_recently = Shipit::Task.recently_created_at - 1.minute
+      @deploy = shipit_deploys(:shipit)
+      @deploy.status = 'success'
+      @deploy.created_at = not_recently
+      @deploy.save!
+
+      @rollback = @deploy.build_rollback
+      @rollback.status = 'running'
+      @rollback.created_at = not_recently
+      @rollback.save!
+
+      @zombie_deploy = shipit_deploys(:shipit2)
+      @zombie_deploy.status = 'running'
+      @zombie_deploy.created_at = not_recently
+      @zombie_deploy.save!
+    end
+
+    test 'reaps only zombie tasks' do
+      refute_predicate @zombie_deploy, :error?
+
+      Shipit::Deploy.any_instance.expects(:alive?).returns(false)
+      Shipit::Rollback.any_instance.expects(:alive?).returns(true)
+      ReapDeadTasksJob.perform_now
+
+      @zombie_deploy.reload
+      assert_predicate @zombie_deploy, :error?
+
+      @deploy.reload
+      assert_predicate @deploy, :finished?
+
+      @rollback.reload
+      assert_predicate @rollback, :running?
+    end
+
+    test "does reap recently created tasks" do
+      Task.where(status: Task::ACTIVE_STATUSES).update_all(status: 'success')
+      recently = Time.current
+      @deploy = shipit_deploys(:shipit)
+      @deploy.created_at = recently
+      @deploy.status = 'running'
+      @deploy.save!
+      Shipit::Deploy.any_instance.expects(:alive?).never
+
+      ReapDeadTasksJob.perform_now
+
+      @deploy.reload
+      assert_predicate @deploy, :running?
+    end
+
+    test 'reaps zombie aborting tasks' do
+      deploy = shipit_deploys(:shipit2)
+      deploy.status = 'aborting'
+      deploy.save!
+
+      ReapDeadTasksJob.perform_now
+
+      assert_predicate deploy.reload, :error?
+    end
+  end
+end

data/test/jobs/refresh_github_user_job_test.rb

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

data/test/jobs/refresh_status_job_test.rb

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

data/test/jobs/unique_job_test.rb

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

data/test/jobs/update_github_last_deployed_ref_job_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -8,22 +9,23 @@ module Shipit
       @deploy = @stack.deploys.last
       @commit = @deploy.until_commit
       @api_client = Shipit.github.api
-      @expected_ref_prefix = "shipit-deploy/#{@stack.environment}"
       @expected_name = @stack.github_repo_name
       @expected_sha = @commit.sha
 
-      expected_ref = ["refs", @expected_ref_prefix].join('/')
-      ref_url = "http://api.github.test.com/shopify/shipit-engine/git/#{expected_ref}"
+      expected_ref_suffix = "shipit-deploy/#{@stack.environment}"
+      @expected_ref = ["heads", expected_ref_suffix].join('/')
+
+      ref_url = "http://api.github.test.com/shopify/shipit-engine/git/#{@expected_ref}"
       commit_url = "https://api.github.test.com/repos/shopify/shipit-engine/git/commits/#{@commit.sha}"
       response_inner_obj = OpenStruct.new(sha: @commit.sha, type: "commit", url: commit_url)
-      @response = OpenStruct.new(ref: expected_ref, node_id: "blah", url: ref_url, object: response_inner_obj)
+      @response = OpenStruct.new(ref: @expected_ref, node_id: "blah", url: ref_url, object: response_inner_obj)
     end
 
     test "#perform will create a ref when one is not present" do
       Octokit::UnprocessableEntity.any_instance.stubs(:build_error_message).returns("Reference does not exist")
 
-      @api_client.expects(:update_ref).with(@expected_name, @expected_ref_prefix, @expected_sha).raises(Octokit::UnprocessableEntity)
-      @api_client.expects(:create_ref).with(@expected_name, @expected_ref_prefix, @expected_sha).returns(@response)
+      @api_client.expects(:update_ref).with(@expected_name, @expected_ref, @expected_sha).raises(Octokit::UnprocessableEntity)
+      @api_client.expects(:create_ref).with(@expected_name, @expected_ref, @expected_sha).returns(@response)
 
       result = @job.perform(@stack)
 
@@ -38,7 +40,7 @@ module Shipit
       @commit.sha = new_sha
       @commit.save
 
-      @api_client.expects(:update_ref).with(@expected_name, @expected_ref_prefix, new_sha).returns(@response)
+      @api_client.expects(:update_ref).with(@expected_name, @expected_ref, new_sha).returns(@response)
 
       result = @job.perform(@stack)
 
@@ -48,8 +50,8 @@ module Shipit
     test '#perform will raise an exception for non ref existence errors' do
       Octokit::UnprocessableEntity.any_instance.stubs(:build_error_message).returns("Some other error.")
 
-      @api_client.expects(:update_ref).with(@expected_name, @expected_ref_prefix, @expected_sha).raises(Octokit::UnprocessableEntity)
-      @api_client.expects(:create_ref).with(@expected_name, @expected_ref_prefix, @expected_sha).never
+      @api_client.expects(:update_ref).with(@expected_name, @expected_ref, @expected_sha).raises(Octokit::UnprocessableEntity)
+      @api_client.expects(:create_ref).with(@expected_name, @expected_ref, @expected_sha).never
 
       assert_raises Octokit::UnprocessableEntity do
         @job.perform(@stack)
@@ -72,7 +74,7 @@ module Shipit
       new_deploy.status = "faulty"
       new_deploy.save
 
-      @api_client.expects(:update_ref).with(@expected_name, @expected_ref_prefix, new_sha).returns(@response)
+      @api_client.expects(:update_ref).with(@expected_name, @expected_ref, new_sha).returns(@response)
       result = @job.perform(@stack)
 
       assert_equal @response, result
@@ -81,7 +83,7 @@ module Shipit
       new_deploy.status = "success"
       new_deploy.save
 
-      @api_client.expects(:update_ref).with(@expected_name, @expected_ref_prefix, new_commit.sha).returns(@response)
+      @api_client.expects(:update_ref).with(@expected_name, @expected_ref, new_commit.sha).returns(@response)
       @job.perform(@stack)
     end
   end

data/test/middleware/same_site_cookie_middleware_test.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+require 'test_helper'
+
+module Shipit
+  class SameSiteCookieMiddlewareTest < ActiveSupport::TestCase
+    def app
+      Rack::Lint.new(lambda { |_env|
+        response = Rack::Response.new("", 200, "Content-Type" => "text/yaml")
+
+        response.set_cookie("session_test", value: "session_test", domain: ".test.com", path: "/")
+        response.set_cookie("another_cookie", value: "123abc", domain: ".test.com", path: "/")
+        response.finish
+      })
+    end
+
+    def env_for_url(url)
+      env = Rack::MockRequest.env_for(url)
+      env
+    end
+
+    def middleware
+      Shipit::SameSiteCookieMiddleware.new(app)
+    end
+
+    test 'SameSite cookie attributes should be added on SSL' do
+      env = env_for_url("https://test.com/")
+
+      _status, headers, _body = middleware.call(env)
+
+      assert_includes headers['Set-Cookie'], 'SameSite'
+    end
+
+    test 'SameSite cookie attributes should be added when multiple cookies are present' do
+      env = env_for_url("https://test.com/")
+
+      _status, headers, _body = middleware.call(env)
+
+      session_cookie, other_cookie = headers['Set-Cookie'].split("\n")
+
+      assert_includes session_cookie, 'SameSite'
+      assert_includes other_cookie, 'SameSite'
+    end
+
+    test 'SameSite cookie attributes should not be added on non SSL requests' do
+      env = env_for_url("http://test.com/")
+
+      _status, headers, _body = middleware.call(env)
+
+      assert_not_includes headers['Set-Cookie'], 'SameSite'
+    end
+  end
+end

data/test/models/api_client_test.rb

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

data/test/models/commit_checks_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 require 'tmpdir'
 

data/test/models/commit_deployment_status_test.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
   class CommitDeploymentStatusTest < ActiveSupport::TestCase
     setup do
-      @status = shipit_commit_deployment_statuses(:shipit2_deploy_third_pending)
+      @status = shipit_commit_deployment_statuses(:shipit2_deploy_third_in_progress)
       @deployment = @status.commit_deployment
       @task = @deployment.task
-      @commit = @deployment.commit
       @author = @deployment.author
     end
 
@@ -14,14 +14,44 @@ module Shipit
       response = stub(id: 44, url: 'https://example.com')
       @author.github_api.expects(:create_deployment_status).with(
         @deployment.api_url,
-        'pending',
+        '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 #{@commit.sha}",
+        description: "walrus triggered the deploy of shopify/shipit-engine/production to #{@deployment.short_sha}",
+        environment_url: "https://shipit.shopify.com",
       ).returns(response)
 
       @status.create_on_github!
       assert_equal response.id, @status.github_id
       assert_equal response.url, @status.api_url
     end
+
+    test 'description is truncated to character limit' do
+      limit = CommitDeploymentStatus::DESCRIPTION_CHARACTER_LIMIT_ON_GITHUB
+      deployment = shipit_commit_deployments(:shipit_deploy_second)
+
+      status = deployment.statuses.create!(status: 'success')
+      status.stubs(:description).returns('desc' * limit)
+      create_status_response = stub(id: 'abcd', url: 'https://github.com/status/abcd')
+      status.author.github_api.expects(:create_deployment_status).with do |*_args, **kwargs|
+        kwargs[:description].size <= limit
+      end.returns(create_status_response)
+
+      status.create_on_github!
+    end
+
+    test 'includes deployment url when the deployment succeeds' do
+      deployment = shipit_commit_deployments(:shipit_deploy_second)
+
+      status = deployment.statuses.create!(status: 'success')
+      stack = status.stack
+      stack.deploy_url = "stack-deploy-url"
+      create_status_response = stub(id: 'abcd', url: 'https://github.com/status/abcd')
+      status.author.github_api.expects(:create_deployment_status).with do |*_args, **kwargs|
+        kwargs[:environment_url] == 'stack-deploy-url'
+      end.returns(create_status_response)
+
+      status.create_on_github!
+    end
   end
 end