shipit-engine 0.35.0 → 0.36.1

data/test/models/deploys_test.rb

@@ -459,6 +459,32 @@ module Shipit
       end
     end
 
+    test "transitioning to aborted locks the stack if a rollback is scheduled" do
+      refute @stack.locked?
+
+      @deploy = shipit_deploys(:shipit_running)
+      @deploy.ping
+      @deploy.pid = 42
+      @deploy.abort!(rollback_once_aborted: true, aborted_by: @user)
+      @deploy.aborted!
+
+      assert_predicate @stack.reload, :locked?
+      assert_equal @user, @stack.lock_author
+    end
+
+    test "transitioning to aborted emits a lock hook if a rollback is scheduled" do
+      refute_predicate @stack, :locked?
+
+      @deploy = shipit_deploys(:shipit_running)
+      @deploy.ping
+      @deploy.pid = 42
+      @deploy.abort!(rollback_once_aborted: true, aborted_by: @user)
+
+      expect_hook(:lock, @stack, locked: true, lock_details: nil, stack: @stack) do
+        @deploy.aborted!
+      end
+    end
+
     test "#build_rollback returns an unsaved record" do
       assert @deploy.build_rollback.new_record?
     end

data/test/models/shipit/deploy_spec/file_system_test.rb

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+require 'test_helper'
+require 'tmpdir'
+
+module Shipit
+  class DeploySpec
+    class FileSystemTest < ActiveSupport::TestCase
+      test 'deploy.pre calls "exit 1" if there is a bare shipit file and Shipit is configured to ignore' do
+        Shipit.expects(:respect_bare_shipit_file?).returns(false).at_least_once
+        deploy_spec = Shipit::DeploySpec::FileSystem.new(Dir.tmpdir, 'env')
+        deploy_spec.expects(:config_file_path).returns(Pathname.new(Dir.tmpdir) + '/shipit.yml').at_least_once
+        deploy_spec.expects(:read_config).never
+        pre_commands = deploy_spec.send(:config, 'deploy', 'pre')
+        assert pre_commands.include?('exit 1')
+        assert pre_commands.first.include?('configured to ignore')
+        refute pre_commands.include?('test 2')
+      end
+
+      test 'deploy.pre does not call "exit 1" if Shipit is not configured to do so' do
+        Shipit.expects(:respect_bare_shipit_file?).returns(true).at_least_once
+        deploy_spec = Shipit::DeploySpec::FileSystem.new(Dir.tmpdir, 'env')
+        deploy_spec.expects(:config_file_path).returns(Pathname.new(Dir.tmpdir) + '/shipit.yml').at_least_once
+        deploy_spec.expects(:read_config).returns(SafeYAML.load(deploy_spec_yaml))
+        pre_commands = deploy_spec.send(:config, 'deploy', 'pre')
+        refute pre_commands.include?('exit 1')
+        assert pre_commands.include?('test 2')
+      end
+
+      test 'Shipit.respect_bare_shipit_file? has no effect if the file is not a bare file' do
+        [true, false].each do |obey_val|
+          Shipit.expects(:respect_bare_shipit_file?).returns(obey_val).at_least_once
+          deploy_spec = Shipit::DeploySpec::FileSystem.new(Dir.tmpdir, 'env')
+          deploy_spec.expects(:config_file_path).returns(Pathname.new(Dir.tmpdir) + '/shipit.env.yml').at_least_once
+          deploy_spec.expects(:read_config).returns(SafeYAML.load(deploy_spec_yaml))
+          pre_commands = deploy_spec.send(:config, 'deploy', 'pre')
+          refute pre_commands.include?('exit 1')
+          assert pre_commands.include?('test 2')
+        end
+      end
+
+      test '#load_config does not error if the file is empty' do
+        Shipit.expects(:respect_bare_shipit_file?).returns(true).at_least_once
+        deploy_spec = Shipit::DeploySpec::FileSystem.new(Dir.tmpdir, 'env')
+        deploy_spec.expects(:config_file_path).returns(Pathname.new(Dir.tmpdir) + '/shipit.env.yml').at_least_once
+        deploy_spec.expects(:read_config).at_least_once.returns(false)
+        loaded_config = deploy_spec.send(:cacheable_config)
+        refute loaded_config == false
+      end
+
+      test '#load_config does not error if there is no "deploy" key' do
+        Shipit.expects(:respect_bare_shipit_file?).returns(false).at_least_once
+        deploy_spec = Shipit::DeploySpec::FileSystem.new(Dir.tmpdir, 'env')
+        deploy_spec.expects(:config_file_path).returns(Pathname.new(Dir.tmpdir) + '/shipit.yml').at_least_once
+        deploy_spec.expects(:read_config).never
+        loaded_config = deploy_spec.send(:load_config)
+        assert loaded_config.key?("deploy")
+        assert loaded_config["deploy"].key?("pre")
+        assert loaded_config["deploy"]["pre"].include?('exit 1')
+      end
+
+      def deploy_spec_yaml
+        <<~EOYAML
+          deploy:
+            pre:
+              - test 2
+            override:
+              - test 1
+        EOYAML
+      end
+
+      def deploy_spec_missing_deploy_yaml
+        <<~EOYAML
+          production_platform:
+            application: test-application
+            runtime_ids:
+              - production-unrestricted-1234
+        EOYAML
+      end
+    end
+  end
+end

data/test/models/tasks_test.rb

@@ -93,7 +93,7 @@ module Shipit
       task = shipit_tasks(:shipit)
       task.update(
         rolled_up: false,
-        created_at: (60 + 1).minutes.ago.to_s(:db),
+        created_at: (60 + 1).minutes.ago.to_formatted_s(:db),
         status: "success",
       )
 
@@ -104,11 +104,23 @@ module Shipit
       task = shipit_tasks(:shipit)
       task.update(
         rolled_up: false,
-        created_at: (60 + 1).minutes.ago.to_s(:db),
+        created_at: (60 + 1).minutes.ago.to_formatted_s(:db),
         status: "error",
       )
 
       assert_includes Shipit::Task.due_for_rollup, task
     end
+
+    test "load legacy YAML records" do
+      task = Shipit::Task.find(shipit_tasks(:shipit_legacy_yaml_task).id)
+      assert_equal({ "POD_ID" => "12" }, task.env)
+      assert_equal Hash, task.env.class
+
+      task.save
+      task.reload
+
+      assert_equal({ "POD_ID" => "12" }, task.env)
+      assert_equal Hash, task.env.class
+    end
   end
 end

data/test/models/team_test.rb

@@ -29,6 +29,25 @@ module Shipit
       end
     end
 
+    test ".find_or_create_by_handle accepts large slugs" do
+      limit = Shipit::Team.columns_hash['slug'].limit
+      skip unless limit
+
+      slug = 'a' * 255
+      team = new_team(slug: slug)
+
+      response = stub(rels: {}, data: [team])
+      Shipit.github.api.expects(:org_teams).with('shopify', per_page: 100).returns(response.data)
+      Shipit.github.api.expects(:last_response).returns(response)
+
+      assert_difference -> { Team.count }, 1 do
+        Team.find_or_create_by_handle("Shopify/#{slug}")
+      end
+
+      team_record = Team.find_by(name: team.name)
+      assert_equal limit, team_record.slug.bytesize
+    end
+
     private
 
     def members_resource
@@ -46,11 +65,11 @@ module Shipit
       )
     end
 
-    def new_team
+    def new_team(slug: 'new-team')
       stub(
         id: 24,
         name: 'New Team',
-        slug: 'new-team',
+        slug: slug,
         url: 'https://example.com',
         description: 'The Best one',
         organization: 'shopify',

data/test/models/users_test.rb

@@ -216,19 +216,24 @@ module Shipit
     end
 
     test "users with legacy encrypted access token get their token reset automatically" do
-      # See: https://github.com/attr-encrypted/attr_encrypted/blob/53266da546a21afaa1f1b93a461b912f4ccf363b/README.md#upgrading-from-attr_encrypted-v2x-to-v3x
       legacy = shipit_users(:legacy)
-      assert_not_nil legacy.encrypted_github_access_token
-      assert_not_nil legacy.encrypted_github_access_token_iv
-
       assert_nil legacy.github_access_token
-      legacy.reload
-      assert_nil legacy.encrypted_github_access_token
-      assert_nil legacy.encrypted_github_access_token_iv
 
-      legacy.update!(github_access_token: 't0k3n')
+      legacy.update!(github_access_token: 'ghu_t0k3n')
+      assert_equal 'ghu_t0k3n', legacy.github_access_token
+    end
+
+    test "users with legacy encrypted access token can be updated" do
+      legacy = shipit_users(:legacy)
+      legacy.update!(github_access_token: 'ghu_t0k3n')
       legacy.reload
-      assert_equal 't0k3n', legacy.github_access_token
+      assert_equal 'ghu_t0k3n', legacy.github_access_token
+    end
+
+    test "users with legacy encrypted access token can have unrelated attributes updated" do
+      legacy = shipit_users(:legacy)
+      legacy.update!(name: 'Test')
+      assert_equal 'Test', legacy.name
     end
 
     test "users are always logged_in?" do
@@ -274,6 +279,21 @@ module Shipit
       assert_equal user, found_user
     end
 
+    test "requires_fresh_login? defaults to false" do
+      u = User.new
+      refute_predicate u, :requires_fresh_login?
+    end
+
+    test "requires_fresh_login? is true for users with legacy github_access_token" do
+      @user.update!(github_access_token: 'some_legacy_value')
+      assert_predicate @user, :requires_fresh_login?
+    end
+
+    test "requires_fresh_login? is false for users with a new format github_access_token" do
+      @user.update!(github_access_token: 'ghu_tok3n')
+      refute_predicate @user, :requires_fresh_login?
+    end
+
     private
 
     def fetch_user

data/test/unit/deploy_commands_test.rb

@@ -27,7 +27,7 @@ module Shipit
 
       command = @commands.fetch
 
-      assert_equal %w(git fetch origin --tags master), command.args
+      assert_equal %w(git fetch origin --quiet --tags master), command.args
     end
 
     test "#fetch calls git fetch in git_path directory if repository cache already exist" do
@@ -134,7 +134,7 @@ module Shipit
 
     test "#checkout checks out the deployed commit" do
       command = @commands.checkout(@deploy.until_commit)
-      assert_equal ['git', 'checkout', @deploy.until_commit.sha], command.args
+      assert_equal ['git', '-c', 'advice.detachedHead=false', 'checkout', @deploy.until_commit.sha], command.args
     end
 
     test "#checkout checks out the deployed commit from the working directory" do