shipit-engine 0.38.0 → 0.40.0

data/test/unit/commands_test.rb

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

data/test/unit/commit_serializer_test.rb

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

data/test/unit/csv_serializer_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -17,11 +18,11 @@ module Shipit
     end
 
     test "load split the words by comma" do
-      assert_loaded %w(foo bar), 'foo,bar'
+      assert_loaded %w[foo bar], 'foo,bar'
     end
 
     test "dump join the words with a comma" do
-      assert_dumped 'foo,bar', %w(foo bar)
+      assert_dumped 'foo,bar', %w[foo bar]
     end
 
     private

data/test/unit/deploy_commands_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -14,7 +15,7 @@ module Shipit
         rollback_steps!: ['bundle exec cap $ENVIRONMENT deploy:rollback'],
         machine_env: { 'GLOBAL' => '1' },
         directory: nil,
-        clear_working_directory?: true,
+        clear_working_directory?: true
       )
       @commands.stubs(:deploy_spec).returns(@deploy_spec)
 
@@ -27,7 +28,7 @@ module Shipit
 
       command = @commands.fetch_commit(@deploy.until_commit)
 
-      assert_equal %W(git fetch origin --quiet --tags #{@deploy.until_commit.sha}), command.args
+      assert_equal %W[git fetch origin --quiet --tags --force #{@deploy.until_commit.sha}], command.args
     end
 
     test "#fetch_commit calls git fetch in git_path directory if repository cache already exist" do
@@ -44,7 +45,7 @@ module Shipit
 
       command = @commands.fetch_commit(@deploy.until_commit)
 
-      expected = %W(git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      expected = %W[git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path}]
       assert_equal expected, command.args.map(&:to_s)
     end
 
@@ -54,7 +55,7 @@ module Shipit
 
       command = @commands.fetch_commit(@deploy.until_commit)
 
-      expected = %W(git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      expected = %W[git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path}]
       assert_equal expected, command.args
     end
 
@@ -62,12 +63,12 @@ module Shipit
       @stack.git_path.stubs(:exist?).returns(true)
       @stack.git_path.stubs(:empty?).returns(false)
       StackCommands.any_instance.expects(:git_cmd_succeeds?)
-        .with(@stack.git_path)
-        .returns(false)
+                   .with(@stack.git_path)
+                   .returns(false)
 
       command = @commands.fetch_commit(@deploy.until_commit)
 
-      expected = %W(git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      expected = %W[git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path}]
       assert_equal expected, command.args
     end
 
@@ -76,12 +77,12 @@ module Shipit
       @stack.git_path.stubs(:exist?).returns(true)
       @stack.git_path.stubs(:empty?).returns(false)
       StackCommands.any_instance.expects(:git_cmd_succeeds?)
-        .with(@stack.git_path)
-        .returns(false)
+                   .with(@stack.git_path)
+                   .returns(false)
 
       command = @commands.fetch_commit(@deploy.until_commit)
 
-      expected = %W(git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      expected = %W[git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path}]
       assert_equal expected, command.args
     end
 
@@ -91,7 +92,7 @@ module Shipit
 
       command = @commands.fetch_commit(@deploy.until_commit)
 
-      expected = %W(git clone --quiet --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      expected = %W[git clone --quiet --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path}]
       assert_equal expected, command.args.map(&:to_s)
     end
 
@@ -121,7 +122,7 @@ module Shipit
 
       command = @commands.fetch
 
-      assert_equal %w(git fetch origin --quiet --tags master), command.args
+      assert_equal %w[git fetch origin --quiet --tags --force master], command.args
     end
 
     test "#fetch calls git fetch in git_path directory if repository cache already exist" do
@@ -138,7 +139,7 @@ module Shipit
 
       command = @commands.fetch
 
-      expected = %W(git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      expected = %W[git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path}]
       assert_equal expected, command.args.map(&:to_s)
     end
 
@@ -148,7 +149,7 @@ module Shipit
 
       command = @commands.fetch
 
-      expected = %W(git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      expected = %W[git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path}]
       assert_equal expected, command.args
     end
 
@@ -156,12 +157,12 @@ module Shipit
       @stack.git_path.stubs(:exist?).returns(true)
       @stack.git_path.stubs(:empty?).returns(false)
       StackCommands.any_instance.expects(:git_cmd_succeeds?)
-        .with(@stack.git_path)
-        .returns(false)
+                   .with(@stack.git_path)
+                   .returns(false)
 
       command = @commands.fetch
 
-      expected = %W(git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      expected = %W[git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path}]
       assert_equal expected, command.args
     end
 
@@ -170,12 +171,12 @@ module Shipit
       @stack.git_path.stubs(:exist?).returns(true)
       @stack.git_path.stubs(:empty?).returns(false)
       StackCommands.any_instance.expects(:git_cmd_succeeds?)
-        .with(@stack.git_path)
-        .returns(false)
+                   .with(@stack.git_path)
+                   .returns(false)
 
       command = @commands.fetch
 
-      expected = %W(git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      expected = %W[git clone --quiet --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path}]
       assert_equal expected, command.args
     end
 
@@ -185,7 +186,16 @@ module Shipit
 
       command = @commands.fetch
 
-      expected = %W(git clone --quiet --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path})
+      expected = %W[git clone --quiet --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path}]
+      assert_equal expected, command.args.map(&:to_s)
+    end
+
+    test "#fetch does not use --quit if git_progress_output is enabled" do
+      Shipit.stubs(:git_progress_output).returns(true)
+
+      command = @commands.fetch
+
+      expected = %W[git clone --single-branch --recursive --branch master #{@stack.repo_git_url} #{@stack.git_path}]
       assert_equal expected, command.args.map(&:to_s)
     end
 
@@ -209,7 +219,7 @@ module Shipit
       clone_args = [
         'git', 'clone', '--quiet',
         '--local', '--origin', 'cache',
-        @stack.git_path.to_s, @deploy.working_directory,
+        @stack.git_path.to_s, @deploy.working_directory
       ]
       assert_equal clone_args, commands.first.args
       assert_equal ['git', 'remote', 'add', 'origin', @stack.repo_git_url.to_s], commands.second.args
@@ -224,7 +234,7 @@ module Shipit
       command = @commands.checkout(@deploy.until_commit)
       checkout_args = [
         'git', '-c', 'advice.detachedHead=false', 'checkout', '--quiet',
-        @deploy.until_commit.sha,
+        @deploy.until_commit.sha
       ]
       assert_equal checkout_args, command.args
     end

data/test/unit/deploy_serializer_test.rb

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

data/test/unit/environment_variables_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -6,7 +7,7 @@ module Shipit
     def setup
       variable_defs = [
         { "name" => "FOO", "title" => "Set to 0 to foo", "default" => 1 },
-        { "name" => "BAR", "title" => "Set to 1 to bar", "default" => 0 },
+        { "name" => "BAR", "title" => "Set to 1 to bar", "default" => 0 }
       ]
       @variable_definitions = variable_defs.map(&VariableDefinition.method(:new))
     end

data/test/unit/github_app_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -45,7 +46,7 @@ module Shipit
               }
             ]
           }
-        ),
+        )
       )
       assert_equal "operational", app.api_status[:status]
     end
@@ -78,15 +79,15 @@ module Shipit
       config = {
         app_id: "test_id",
         installation_id: "test_installation_id",
-        private_key: "test_private_key",
+        private_key: "test_private_key"
       }
       initial_token = OpenStruct.new(
         token: "some_initial_github_token",
-        expires_at: Time.now.utc + 60.minutes,
+        expires_at: Time.now.utc + 60.minutes
       )
       second_token = OpenStruct.new(
         token: "some_new_github_token",
-        expires_at: initial_token.expires_at + 60.minutes,
+        expires_at: initial_token.expires_at + 60.minutes
       )
       auth_payload = "test_auth_payload"
 
@@ -116,15 +117,15 @@ module Shipit
       config = {
         app_id: "test_id",
         installation_id: "test_installation_id",
-        private_key: "test_private_key",
+        private_key: "test_private_key"
       }
       initial_token = OpenStruct.new(
         token: "some_initial_github_token",
-        expires_at: Time.now.utc + 60.minutes,
+        expires_at: Time.now.utc + 60.minutes
       )
       second_token = OpenStruct.new(
         token: "some_new_github_token",
-        expires_at: initial_token.expires_at + 60.minutes,
+        expires_at: initial_token.expires_at + 60.minutes
       )
       auth_payload = "test_auth_payload"
 
@@ -161,14 +162,14 @@ module Shipit
       config = {
         app_id: "test_id",
         installation_id: "test_installation_id",
-        private_key: "test_private_key",
+        private_key: "test_private_key"
       }
       initial_cached_token = Shipit::GitHubApp::Token.new("some_initial_github_token", Time.now.utc - 1.minute)
       initial_cached_token.instance_variable_set(:@refresh_at, nil)
 
       second_token = OpenStruct.new(
         token: "some_new_github_token",
-        expires_at: initial_cached_token.expires_at + 60.minutes,
+        expires_at: initial_cached_token.expires_at + 60.minutes
       )
       auth_payload = "test_auth_payload"
 
@@ -202,7 +203,7 @@ module Shipit
     end
 
     def default_config
-      Rails.application.secrets.github.deep_dup
+      Rails.application.credentials.github.deep_dup
     end
   end
 end

data/test/unit/github_apps_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -69,7 +70,7 @@ module Shipit
               }
             ]
           }
-        ),
+        )
       )
       assert_equal "operational", app(@organization).api_status[:status]
     end
@@ -79,15 +80,15 @@ module Shipit
       config = {
         app_id: "test_id",
         installation_id: "test_installation_id",
-        private_key: "test_private_key",
+        private_key: "test_private_key"
       }
       initial_token = OpenStruct.new(
         token: "some_initial_github_token",
-        expires_at: Time.now.utc + 60.minutes,
+        expires_at: Time.now.utc + 60.minutes
       )
       second_token = OpenStruct.new(
         token: "some_new_github_token",
-        expires_at: initial_token.expires_at + 60.minutes,
+        expires_at: initial_token.expires_at + 60.minutes
       )
       auth_payload = "test_auth_payload"
 
@@ -117,15 +118,15 @@ module Shipit
       config = {
         app_id: "test_id",
         installation_id: "test_installation_id",
-        private_key: "test_private_key",
+        private_key: "test_private_key"
       }
       initial_token = OpenStruct.new(
         token: "some_initial_github_token",
-        expires_at: Time.now.utc + 60.minutes,
+        expires_at: Time.now.utc + 60.minutes
       )
       second_token = OpenStruct.new(
         token: "some_new_github_token",
-        expires_at: initial_token.expires_at + 60.minutes,
+        expires_at: initial_token.expires_at + 60.minutes
       )
       auth_payload = "test_auth_payload"
 
@@ -162,14 +163,14 @@ module Shipit
       config = {
         app_id: "test_id",
         installation_id: "test_installation_id",
-        private_key: "test_private_key",
+        private_key: "test_private_key"
       }
       initial_cached_token = Shipit::GitHubApp::Token.new("some_initial_github_token", Time.now.utc - 1.minute)
       initial_cached_token.instance_variable_set(:@refresh_at, nil)
 
       second_token = OpenStruct.new(
         token: "some_new_github_token",
-        expires_at: initial_cached_token.expires_at + 60.minutes,
+        expires_at: initial_cached_token.expires_at + 60.minutes
       )
       auth_payload = "test_auth_payload"
 
@@ -275,7 +276,7 @@ module Shipit
               }
             ]
           }
-        ),
+        )
       )
       assert_equal "operational", app(@organization).api_status[:status]
     end
@@ -285,15 +286,15 @@ module Shipit
       config = {
         app_id: "test_id",
         installation_id: "test_installation_id",
-        private_key: "test_private_key",
+        private_key: "test_private_key"
       }
       initial_token = OpenStruct.new(
         token: "some_initial_github_token",
-        expires_at: Time.now.utc + 60.minutes,
+        expires_at: Time.now.utc + 60.minutes
       )
       second_token = OpenStruct.new(
         token: "some_new_github_token",
-        expires_at: initial_token.expires_at + 60.minutes,
+        expires_at: initial_token.expires_at + 60.minutes
       )
       auth_payload = "test_auth_payload"
 
@@ -323,15 +324,15 @@ module Shipit
       config = {
         app_id: "test_id",
         installation_id: "test_installation_id",
-        private_key: "test_private_key",
+        private_key: "test_private_key"
       }
       initial_token = OpenStruct.new(
         token: "some_initial_github_token",
-        expires_at: Time.now.utc + 60.minutes,
+        expires_at: Time.now.utc + 60.minutes
       )
       second_token = OpenStruct.new(
         token: "some_new_github_token",
-        expires_at: initial_token.expires_at + 60.minutes,
+        expires_at: initial_token.expires_at + 60.minutes
       )
       auth_payload = "test_auth_payload"
 
@@ -368,14 +369,14 @@ module Shipit
       config = {
         app_id: "test_id",
         installation_id: "test_installation_id",
-        private_key: "test_private_key",
+        private_key: "test_private_key"
       }
       initial_cached_token = Shipit::GitHubApp::Token.new("some_initial_github_token", Time.now.utc - 1.minute)
       initial_cached_token.instance_variable_set(:@refresh_at, nil)
 
       second_token = OpenStruct.new(
         token: "some_new_github_token",
-        expires_at: initial_cached_token.expires_at + 60.minutes,
+        expires_at: initial_cached_token.expires_at + 60.minutes
       )
       auth_payload = "test_auth_payload"
 

data/test/unit/github_url_helper_test.rb

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

data/test/unit/line_buffer_test.rb

@@ -13,7 +13,7 @@ module Shipit
     end
 
     test "splits up multiple lines" do
-      assert_equal(%w(a b), @buffer.buffer("a\nb\n").to_a)
+      assert_equal(%w[a b], @buffer.buffer("a\nb\n").to_a)
       assert_predicate(@buffer, :empty?)
     end
   end

data/test/unit/rollback_commands_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -13,7 +14,7 @@ module Shipit
         rollback_steps!: ['bundle exec cap $ENVIRONMENT deploy:rollback'],
         machine_env: { 'GLOBAL' => '1' },
         directory: nil,
-        clear_working_directory?: true,
+        clear_working_directory?: true
       )
       @commands.stubs(:deploy_spec).returns(@deploy_spec)
 

data/test/unit/shipit_helper_test.rb

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

data/test/unit/shipit_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -9,7 +10,6 @@ module Shipit
 
     test ".github uses indifferent access to search through the Github applications" do
       secrets = ActiveSupport::OrderedOptions.new
-      secrets.merge!(Rails::Secrets.parse(['test/dummy/config/secrets.yml'], env: Rails.env))
       secrets.merge!(YAML.load_file('test/dummy/config/secrets_double_github_app.yml'))
       secrets.deep_symbolize_keys!
       Shipit.stubs(:secrets).returns(secrets)
@@ -29,5 +29,51 @@ module Shipit
       Shipit.github.stubs(:oauth_teams).returns(['shopify/developers'])
       assert_equal(['shopify/developers'], Shipit.github_teams.map(&:handle))
     end
+
+    class RedisTest < self
+      setup do
+        @client = mock(:client)
+      end
+
+      teardown do
+        Shipit.instance_variables.each(&Shipit.method(:remove_instance_variable))
+        Redis.unstub(:new)
+      end
+
+      test ".redis should build a new redis client" do
+        Redis.expects(:new).with(
+          has_entries(
+            url: Shipit.redis_url.to_s,
+            reconnect_attempts: 3,
+            reconnect_delay: 0.5,
+            reconnect_delay_max: 1
+          )
+        ).returns(@client)
+
+        assert_equal(@client, Shipit.redis)
+      end
+
+      test ".redis should return an existing redis client" do
+        Redis.expects(:new).once.returns(@client)
+
+        2.times do
+          assert_equal(@client, Shipit.redis)
+        end
+      end
+
+      test ".redis= should set the redis client" do
+        Shipit.redis = @client
+
+        assert_equal(@client, Shipit.redis)
+      end
+
+      test ".redis= should set and memoize the redis client" do
+        Shipit.redis = @client
+
+        Redis.expects(:new).never
+
+        assert_equal(@client, Shipit.redis)
+      end
+    end
   end
 end

data/test/unit/user_serializer_test.rb

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

data/test/unit/variable_definition_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -7,9 +8,9 @@ module Shipit
       @attributes = {
         "name" => "Variable name",
         "title" => "Variable title",
-        "default" => "Variable default",
+        "default" => "Variable default"
       }
-      @select = %w(var1 var2 var3)
+      @select = %w[var1 var2 var3]
     end
 
     test "#initialize sets up the expected values" do
@@ -53,7 +54,7 @@ module Shipit
     test "#default_provided?" do
       attributes = {
         "name" => "Variable name",
-        "title" => "Variable title",
+        "title" => "Variable title"
       }
       subject = Shipit::VariableDefinition.new(attributes)
       refute subject.default_provided?