shipit-engine 0.39.0 → 0.40.0

data/lib/tasks/shipit.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 namespace :shipit do
   desc "Deploy from a running instance. "
   task deploy: :environment do
@@ -12,12 +13,12 @@ namespace :shipit do
       class Task
         def write(text)
           p(text)
-          chunks.create!(text: text)
+          chunks.create!(text:)
         end
       end
     end
 
-    Shipit::Stack.run_deploy_in_foreground(stack: stack, revision: revision)
+    Shipit::Stack.run_deploy_in_foreground(stack:, revision:)
   rescue ArgumentError
     p("Use this command as follows:")
     p("bundle exec rake shipit:deploy stack='shopify/shipit/production' revision='$SHA'")

data/lib/tasks/teams.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 namespace :teams do
   desc "Import the members of each team configured through the github.oauth.teams config"
   task fetch: :environment do
@@ -6,9 +7,9 @@ namespace :teams do
       puts "Fetching @#{team.handle} members"
       begin
         team.refresh_members!
-      rescue Octokit::Unauthorized, Octokit::NotFound => error
+      rescue Octokit::Unauthorized, Octokit::NotFound => e
         puts "Failed to fetch @#{team.handle} members. Do you have enough permissions?"
-        puts "#{error.class}: #{error.message}"
+        puts "#{e.class}: #{e.message}"
       end
     end
   end

data/test/controllers/api/base_controller_test.rb

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

data/test/controllers/api/ccmenu_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -32,7 +33,7 @@ module Shipit
       test "xml contains required attributes" do
         get :show, params: { stack_id: @stack.to_param }
         project = get_project_from_xml(response.body)
-        %w(name activity lastBuildStatus lastBuildLabel lastBuildTime webUrl).each do |attribute|
+        %w[name activity lastBuildStatus lastBuildLabel lastBuildTime webUrl].each do |attribute|
           assert_includes project, attribute, "Response missing required attribute: #{attribute}"
         end
       end
@@ -55,9 +56,9 @@ module Shipit
         Hash.from_xml(xml)['Projects']['Project']
       end
 
-      def assert_payload(k, v)
+      def assert_payload(key, value)
         @project ||= get_project_from_xml(response.body)
-        assert_equal(v, @project[k])
+        assert_equal(value, @project[key])
       end
     end
   end

data/test/controllers/api/commits_controller_test.rb

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

data/test/controllers/api/deploys_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -49,7 +50,7 @@ module Shipit
         request.headers['X-Shipit-User'] = @user.login
         post :create, params: { stack_id: @stack.to_param, sha: @commit.sha }
         deploy = Deploy.last
-        deploy.user == @user
+        assert_equal @user, deploy.user
       end
 
       test "#create normalises the claimed user" do

data/test/controllers/api/hooks_controller_test.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'test_helper'
 
 module Shipit
@@ -49,7 +50,7 @@ module Shipit
 
       test "#create adds a new hook" do
         assert_difference -> { Hook.count }, 1 do
-          post :create, params: { delivery_url: 'https://example.com/hook', events: %w(deploy rollback) }
+          post :create, params: { delivery_url: 'https://example.com/hook', events: %w[deploy rollback] }
         end
         hook = Hook.last
         assert_json 'delivery_url', 'https://example.com/hook'
@@ -60,14 +61,14 @@ module Shipit
       test "#create do not allow to set protected attributes" do
         post :create, params: {
           delivery_url: 'https://example.com/hook',
-          events: %w(deploy rollback),
-          created_at: 2.months.ago.to_formatted_s(:db),
+          events: %w[deploy rollback],
+          created_at: 2.months.ago.to_formatted_s(:db)
         }
-        Hook.last.created_at > 2.seconds.ago
+        assert_operator Hook.last.created_at, :>, 2.seconds.ago
       end
 
       test "#create returns validation errors" do
-        post :create, params: { delivery_url: '../etc/passwd', events: %w(deploy) }
+        post :create, params: { delivery_url: '../etc/passwd', events: %w[deploy] }
         assert_response :unprocessable_entity
         assert_json 'errors', 'delivery_url' => ['is not a valid URL']
       end

data/test/controllers/api/locks_controller_test.rb

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

data/test/controllers/api/merge_requests_controller_test.rb

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

data/test/controllers/api/outputs_controller_test.rb

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

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