shipit-engine 0.38.0 → 0.40.0

data/test/controllers/api/release_statuses_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -21,7 +22,7 @@ module Shipit
           post :create, params: {
             stack_id: @stack.to_param,
             deploy_id: @deploy.id,
-            status: 'foo',
+            status: 'foo'
           }
         end
 
@@ -34,7 +35,7 @@ module Shipit
           post :create, params: {
             stack_id: @stack.to_param,
             deploy_id: @deploy.id,
-            status: 'success',
+            status: 'success'
           }
           assert_response :created
         end
@@ -51,7 +52,7 @@ module Shipit
           post :create, params: {
             stack_id: @stack.to_param,
             deploy_id: @deploy.id,
-            status: 'failure',
+            status: 'failure'
           }
           assert_response :created
         end

data/test/controllers/api/rollback_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -38,14 +39,14 @@ module Shipit
         request.headers['X-Shipit-User'] = @user.login
         post :create, params: { stack_id: @stack.to_param, sha: @commit.sha }
         rollback = Rollback.last
-        rollback.user == @user
+        assert_equal @user, rollback.user
       end
 
       test "#create normalises the claimed user" do
         request.headers['X-Shipit-User'] = @user.login.swapcase
         post :create, params: { stack_id: @stack.to_param, sha: @commit.sha }
         rollback = Rollback.last
-        rollback.user == @user
+        assert_equal @user, rollback.user
       end
 
       test "#create renders a 422 if the sha isn't found" do

data/test/controllers/api/stacks_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -41,24 +42,24 @@ module Shipit
       test "#create fails to create stack if it already exists" do
         repository = shipit_repositories(:rails)
         existing_stack = Stack.create!(
-          repository: repository,
+          repository:,
           environment: 'staging',
-          branch: 'staging',
+          branch: 'staging'
         )
 
         assert_no_difference -> { Stack.count } do
           post :create,
-            params: {
-              repo_name: existing_stack.repo_name,
-              repo_owner: existing_stack.repo_owner,
-              environment: existing_stack.environment,
-              branch: existing_stack.branch,
-            }
+               params: {
+                 repo_name: existing_stack.repo_name,
+                 repo_owner: existing_stack.repo_owner,
+                 environment: existing_stack.environment,
+                 branch: existing_stack.branch
+               }
         end
 
         assert_response :unprocessable_entity
         assert_json 'errors', 'repository' => [
-          'cannot be used more than once with this environment. Check archived stacks.',
+          'cannot be used more than once with this environment. Check archived stacks.'
         ]
       end
 
@@ -71,7 +72,7 @@ module Shipit
           id: @stack.to_param,
           merge_queue_enabled: false,
           ignore_ci: true,
-          continuous_deployment: true,
+          continuous_deployment: true
         }
 
         assert_response :ok
@@ -87,7 +88,7 @@ module Shipit
 
         patch :update, params: {
           id: @stack.to_param,
-          branch: 'test',
+          branch: 'test'
         }
 
         assert_response :ok
@@ -104,7 +105,7 @@ module Shipit
 
         patch :update, params: {
           id: @stack.to_param,
-          continuous_deployment: false,
+          continuous_deployment: false
         }
 
         assert_response :ok

data/test/controllers/api/tasks_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -39,42 +40,42 @@ module Shipit
 
         expected_env = {
           "FOO" => "1",
-          "BAR" => "0",
+          "BAR" => "0"
         }
         assert_equal expected_env, Shipit::Task.last.env
       end
 
       test "#trigger refuses to trigger a task with tasks not whitelisted" do
         env = { 'DANGEROUS_VARIABLE' => 'bar' }
-        post :trigger, params: { stack_id: @stack.to_param, task_name: 'restart', env: env }
+        post :trigger, params: { stack_id: @stack.to_param, task_name: 'restart', env: }
         assert_response :unprocessable_entity
         assert_json 'message', 'Variables DANGEROUS_VARIABLE have not been whitelisted'
       end
 
       test "#trigger triggers a task with only whitelisted env variables" do
         env = { 'FOO' => 'bar' }
-        post :trigger, params: { stack_id: @stack.to_param, task_name: 'restart', env: env }
+        post :trigger, params: { stack_id: @stack.to_param, task_name: 'restart', env: }
         assert_response :accepted
         assert_json 'type', 'task'
         assert_json 'status', 'pending'
 
         expected_env = {
           "FOO" => "bar",
-          "BAR" => "0",
+          "BAR" => "0"
         }
         assert_equal expected_env, Shipit::Task.last.env
       end
 
       test "#trigger triggers a task with explicitly passed and default variables" do
         env = { 'WALRUS' => 'overridden value' }
-        post :trigger, params: { stack_id: @stack.to_param, task_name: 'restart', env: env }
+        post :trigger, params: { stack_id: @stack.to_param, task_name: 'restart', env: }
         assert_response :accepted
 
         # FOO and BAR are variables with a default value
         expected_env = {
           "FOO" => "1",
           "BAR" => "0",
-          "WALRUS" => "overridden value",
+          "WALRUS" => "overridden value"
         }
         assert_equal expected_env, Shipit::Task.last.env
       end

data/test/controllers/api_clients_controller_test.rb

@@ -23,7 +23,7 @@ module Shipit
       assert_response :forbidden
       assert_equal(
         'You must be a member of cyclimse/cooks or shopify/developers to access this application.',
-        response.body,
+        response.body
       )
     end
 
@@ -44,9 +44,9 @@ module Shipit
             name: 'walrus_app',
             permissions: [
               'read:stack',
-              'lock:stack',
-            ],
-          },
+              'lock:stack'
+            ]
+          }
         }
       end
 
@@ -59,9 +59,9 @@ module Shipit
           name: 'walrus_app',
           permissions: [
             'read:stack',
-            'lock:stack',
-          ],
-        },
+            'lock:stack'
+          ]
+        }
       }
 
       assert_equal shipit_users(:walrus).id, ApiClient.last.creator.id
@@ -84,15 +84,15 @@ module Shipit
     test "#update updates an existing api_client" do
       new_permissions = [
         'read:stack',
-        'lock:stack',
+        'lock:stack'
       ]
 
       assert_difference "ApiClient.count", 0 do
         patch :update, params: {
           id: @api_client.id,
           api_client: {
-            permissions: new_permissions,
-          },
+            permissions: new_permissions
+          }
         }
       end
       @api_client.reload

data/test/controllers/ccmenu_controller_test.rb

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

data/test/controllers/commit_checks_controller_test.rb

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

data/test/controllers/commits_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -14,10 +15,10 @@ module Shipit
       refute_predicate(@commit, :locked?)
 
       patch(:update, params: {
-        stack_id: @stack.to_param,
-        id: @commit.id,
-        commit: { locked: true },
-      })
+              stack_id: @stack.to_param,
+              id: @commit.id,
+              commit: { locked: true }
+            })
 
       assert_response(:ok)
       @commit.reload
@@ -29,10 +30,10 @@ module Shipit
       @commit.lock(@user)
 
       patch(:update, params: {
-        stack_id: @stack.to_param,
-        id: @commit.id,
-        commit: { locked: false },
-      })
+              stack_id: @stack.to_param,
+              id: @commit.id,
+              commit: { locked: false }
+            })
 
       assert_response(:ok)
       @commit.reload

data/test/controllers/continuous_delivery_schedules_controller_test.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Shipit
+  class ContinuousDeliverySchedulesControllerTest < ActionController::TestCase
+    setup do
+      @routes = Shipit::Engine.routes
+      @stack = shipit_stacks(:shipit)
+      session[:user_id] = shipit_users(:walrus).id
+    end
+
+    def valid_params
+      Shipit::ContinuousDeliverySchedule::DAYS.each_with_object({}) do |day, hash|
+        hash[:"#{day}_enabled"] = "0"
+        hash[:"#{day}_start"] = "09:00"
+        hash[:"#{day}_end"] = "17:00"
+      end
+    end
+
+    test "#show returns a 200 response" do
+      get(:show, params: { id: @stack.to_param })
+
+      assert(response.ok?)
+    end
+
+    test "#update" do
+      patch(:update, params: {
+              id: @stack.to_param,
+              continuous_delivery_schedule: {
+          **valid_params
+              }
+            })
+
+      assert_redirected_to(stack_continuous_delivery_schedule_path(@stack))
+      assert_equal("Successfully updated", flash[:success])
+
+      schedule = @stack.continuous_delivery_schedule
+
+      Shipit::ContinuousDeliverySchedule::DAYS.each do |day|
+        refute(schedule.read_attribute("#{day}_enabled"))
+
+        day_start = schedule.read_attribute("#{day}_start")
+        assert_equal("09:00:00 AM", day_start.strftime("%r"))
+
+        day_end = schedule.read_attribute("#{day}_end")
+        assert_equal("05:00:00 PM", day_end.strftime("%r"))
+      end
+    end
+
+    test "#update renders validation errors" do
+      patch(:update, params: {
+              id: @stack.to_param,
+              continuous_delivery_schedule: {
+          # Make Sunday end before it starts
+          **valid_params.merge(sunday_end: "08:00")
+              }
+            })
+
+      assert_response(:unprocessable_entity)
+      assert_equal("Check form for errors", flash[:warning])
+      elements = assert_select(".validation-errors")
+      assert_includes(elements.sole.inner_text, "Sunday end must be after start (09:00 AM)")
+    end
+  end
+end

data/test/controllers/deploys_controller_test.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
   class DeploysControllerTest < ActionController::TestCase
     setup do
-      Deploy.where(status: %w(running pending)).update_all(status: 'success')
+      Deploy.where(status: %w[running pending]).update_all(status: 'success')
       @stack = shipit_stacks(:shipit)
       @deploy = shipit_deploys(:shipit)
       @commit = shipit_commits(:second)
@@ -31,6 +32,7 @@ module Shipit
     test ":new works for not yet deployed stacks" do
       @stack = shipit_stacks(:undeployed_stack)
       get :new, params: { stack_id: @stack.to_param, sha: @stack.commits.last.sha }
+      assert_response :success
     end
 
     test ":new shows a warning if a deploy is already running" do
@@ -62,7 +64,7 @@ module Shipit
 
     test ":create can receive an :env hash" do
       env = { 'SAFETY_DISABLED' => '1' }
-      post :create, params: { stack_id: @stack.to_param, deploy: { until_commit_id: @commit.id, env: env } }
+      post :create, params: { stack_id: @stack.to_param, deploy: { until_commit_id: @commit.id, env: } }
       new_deploy = Deploy.last
       assert_equal env, new_deploy.env
     end

data/test/controllers/github_authentication_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -6,7 +7,7 @@ module Shipit
     test ":callback can sign in to github" do
       auth = OmniAuth::AuthHash.new(
         credentials: OmniAuth::AuthHash.new(
-          token: 's3cr3t',
+          token: 's3cr3t'
         ),
         extra: OmniAuth::AuthHash.new(
           raw_info: OmniAuth::AuthHash.new(
@@ -15,9 +16,9 @@ module Shipit
             email: 'shipit-user@example.com',
             login: 'shipit-user',
             avatar_url: 'https://example.com',
-            api_url: 'https://github.com/api/v3/users/shipit-user',
-          ),
-        ),
+            api_url: 'https://github.com/api/v3/users/shipit-user'
+          )
+        )
       )
       @request.env['omniauth.auth'] = auth
 
@@ -28,6 +29,7 @@ module Shipit
       user = User.find_by(login: 'shipit-user')
       assert_equal 's3cr3t', user.github_access_token
       assert_equal 44, user.github_id
+      assert session[:authenticated], "Expected session[:authenticated] to be true"
     end
   end
 end

data/test/controllers/merge_requests_controller_test.rb

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

data/test/controllers/merge_status_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -38,14 +39,14 @@ module Shipit
     test "GET show prefers stacks with merge_queue_enabled" do
       existing = shipit_stacks(:shipit)
       Shipit::Stack.where(
-        repository: existing.repository,
+        repository: existing.repository
       ).update_all(merge_queue_enabled: false)
 
       Shipit::Stack.create(
         repository: existing.repository,
         environment: 'foo',
         branch: existing.branch,
-        merge_queue_enabled: true,
+        merge_queue_enabled: true
       )
 
       get :show, params: { referrer: 'https://github.com/Shopify/shipit-engine/pull/42', branch: 'master' }
@@ -56,7 +57,7 @@ module Shipit
     test "GET show prefers locked stacks above all else" do
       existing = shipit_stacks(:shipit)
       Shipit::Stack.where(
-        repository: existing.repository,
+        repository: existing.repository
       ).update_all(lock_reason: 'testing', merge_queue_enabled: false, locked_since: Time.now.utc)
 
       # Shipit would otherwise prefer this, because it has the merge queue enabled
@@ -64,7 +65,7 @@ module Shipit
         repository: existing.repository,
         environment: 'foo',
         branch: existing.branch,
-        merge_queue_enabled: true,
+        merge_queue_enabled: true
       )
 
       get :show, params: { referrer: 'https://github.com/Shopify/shipit-engine/pull/42', branch: 'master' }

data/test/controllers/release_statuses_controller_test.rb

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

data/test/controllers/repositories_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -22,7 +23,7 @@ module Shipit
       assert_response :forbidden
       assert_equal(
         'You must be a member of cyclimse/cooks or shopify/developers to access this application.',
-        response.body,
+        response.body
       )
     end
 
@@ -36,8 +37,8 @@ module Shipit
         post :create, params: {
           repository: {
             name: 'valid',
-            owner: 'repository',
-          },
+            owner: 'repository'
+          }
         }
       end
       assert_redirected_to repository_path(Repository.last)
@@ -48,8 +49,8 @@ module Shipit
         post :create, params: {
           repository: {
             owner: 'some',
-            name: 'owner/path',
-          },
+            name: 'owner/path'
+          }
         }
       end
       assert_response :success

data/test/controllers/rollbacks_controller_test.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
   class RollbacksControllerTest < ActionController::TestCase
     setup do
-      Deploy.where(status: %w(running pending)).update_all(status: 'success')
+      Deploy.where(status: %w[running pending]).update_all(status: 'success')
       @stack = shipit_stacks(:shipit)
       @deploy = shipit_deploys(:shipit)
       session[:user_id] = shipit_users(:walrus).id
@@ -18,7 +19,7 @@ module Shipit
 
     test ":create can receive an :env hash" do
       env = { 'SAFETY_DISABLED' => '1' }
-      post :create, params: { stack_id: @stack.to_param, rollback: { parent_id: @deploy.id, env: env } }
+      post :create, params: { stack_id: @stack.to_param, rollback: { parent_id: @deploy.id, env: } }
       new_rollback = Rollback.last
       assert_equal env, new_rollback.env
     end

data/test/controllers/stacks_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -10,7 +11,7 @@ module Shipit
     end
 
     test "validates that Shipit.github is present" do
-      Rails.application.secrets.stubs(:github).returns(nil)
+      Rails.application.credentials.stubs(:github).returns(nil)
       get :index
       assert_select "#github_app .missing"
       assert_select ".missing", count: 1
@@ -54,7 +55,7 @@ module Shipit
       assert_response :forbidden
       assert_equal(
         'You must be a member of cyclimse/cooks or shopify/developers to access this application.',
-        response.body,
+        response.body
       )
     end
 
@@ -98,6 +99,7 @@ module Shipit
     test "#show handles locked stacks without a lock_author" do
       @stack.update!(lock_reason: "I am a lock with no author")
       get :show, params: { id: @stack.to_param }
+      assert_response :ok
     end
 
     test "#show auto-links URLs in lock reason" do
@@ -114,8 +116,8 @@ module Shipit
             repo_name: 'rails',
             repo_owner: 'rails',
             environment: 'staging',
-            branch: 'staging',
-          },
+            branch: 'staging'
+          }
         }
       end
 
@@ -240,8 +242,8 @@ module Shipit
           repo_owner: 'rails',
           environment: 'staging',
           branch: 'staging',
-          deploy_url: 'Javascript:alert(1);',
-        },
+          deploy_url: 'Javascript:alert(1);'
+        }
       }
       assert_response :success
       assert_equal 'Deploy url is invalid', flash[:warning]

data/test/controllers/status_controller_test.rb

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

data/test/controllers/tasks_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -11,9 +12,16 @@ module Shipit
       session[:user_id] = shipit_users(:walrus).id
     end
 
-    test "tasks defined in the shipit.yml can be displayed" do
+    test "tasks defined in the shipit.yml can be displayed with default variable values" do
       get :new, params: { stack_id: @stack, definition_id: @definition.id }
       assert_response :ok
+      assert_select 'input[name="task[env][FOO]"][value="1"]'
+    end
+
+    test "it is possible to provide a default value override for a task" do
+      get :new, params: { stack_id: @stack, definition_id: @definition.id, FOO: '42' }
+      assert_response :ok
+      assert_select 'input[name="task[env][FOO]"][value="42"]'
     end
 
     test "tasks defined in the shipit.yml can't be triggered if the stack is being deployed" do
@@ -47,7 +55,7 @@ module Shipit
     test "tasks with variables defined in the shipit.yml can be triggered with their variables set" do
       env = { "FOO" => "0" }
 
-      post :create, params: { stack_id: @stack, definition_id: @definition.id, task: { env: env }, force: 'true' }
+      post :create, params: { stack_id: @stack, definition_id: @definition.id, task: { env: }, force: 'true' }
 
       assert_redirected_to stack_tasks_path(@stack, Task.last)
     end
@@ -106,7 +114,7 @@ module Shipit
 
       get :tail, params: { stack_id: @stack.to_param, id: @task.id }, format: :json
       assert_response :success
-      assert_json_keys %w(url status output)
+      assert_json_keys %w[url status output]
       assert_json 'status', @task.status
       assert_json 'output', @task.chunk_output
       assert_json 'url', "/shopify/shipit-engine/production/tasks/#{@task.id}/tail?last_byte=#{last_chunk}"
@@ -118,7 +126,7 @@ module Shipit
 
       get :tail, params: { stack_id: @stack.to_param, id: @task.id, last_byte: "50" }, format: :json
       assert_response :success
-      assert_json_keys %w(url status output)
+      assert_json_keys %w[url status output]
     end
 
     test ":tail doesn't returns the next url if the task is finished" do
@@ -134,7 +142,7 @@ module Shipit
 
       get :tail, params: { stack_id: @stack.to_param, id: @task.id }, format: :json
       assert_response :success
-      assert_json_keys %w(status output rollback_url)
+      assert_json_keys %w[status output rollback_url]
     end
 
     test ":lookup returns stack task url if the task is an instance of Task" do