shipit-engine 0.28.0 → 0.32.0

data/test/controllers/api_clients_controller_test.rb

@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Shipit
+  class ApiClientsControllerTest < ActionController::TestCase
+    setup do
+      @routes = Shipit::Engine.routes
+      @api_client = shipit_api_clients(:here_come_the_walrus)
+      session[:user_id] = shipit_users(:walrus).id
+    end
+
+    test "GitHub authentication is mandatory" do
+      session[:user_id] = nil
+      get :index
+      assert_redirected_to '/github/auth/github?origin=http%3A%2F%2Ftest.host%2Fapi_clients'
+    end
+
+    test "current_user must be a member of at least a Shipit.github_teams" do
+      session[:user_id] = shipit_users(:bob).id
+      Shipit.stubs(:github_teams).returns([shipit_teams(:cyclimse_cooks), shipit_teams(:shopify_developers)])
+      get :index
+      assert_response :forbidden
+      assert_equal(
+        'You must be a member of cyclimse/cooks or shopify/developers to access this application.',
+        response.body,
+      )
+    end
+
+    test "#index is successful with a valid user" do
+      get :index
+      assert_response :ok
+    end
+
+    test "#new is success" do
+      get :new
+      assert_response :ok
+    end
+
+    test "#create creates a new api_client" do
+      assert_difference "ApiClient.count", +1 do
+        post :create, params: {
+          api_client: {
+            name: 'walrus_app',
+            permissions: [
+              'read:stack',
+              'lock:stack',
+            ],
+          },
+        }
+      end
+
+      assert_redirected_to api_client_path(ApiClient.last)
+    end
+
+    test "#create attaches the current user to the created api client" do
+      post :create, params: {
+        api_client: {
+          name: 'walrus_app',
+          permissions: [
+            'read:stack',
+            'lock:stack',
+          ],
+        },
+      }
+
+      assert_equal shipit_users(:walrus).id, ApiClient.last.creator.id
+    end
+
+    test "#create when not valid renders new" do
+      assert_no_difference "Stack.count" do
+        post :create, params: { api_client: { name: 'walrus_app', permissions: ['invalid'] } }
+      end
+
+      assert flash[:warning]
+      assert_response :success
+    end
+
+    test "#show is success" do
+      get :show, params: { id: @api_client.id }
+      assert_response :ok
+    end
+
+    test "#update updates an existing api_client" do
+      new_permissions = [
+        'read:stack',
+        'lock:stack',
+      ]
+
+      assert_difference "ApiClient.count", 0 do
+        patch :update, params: {
+          id: @api_client.id,
+          api_client: {
+            permissions: new_permissions,
+          },
+        }
+      end
+      @api_client.reload
+
+      assert_redirected_to api_client_path(@api_client)
+      assert_equal new_permissions, @api_client.permissions
+    end
+  end
+end

data/test/controllers/ccmenu_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'uri'
 require 'test_helper'
 
@@ -10,7 +11,7 @@ module Shipit
     end
 
     test ":fetch returns ok with json" do
-      get :fetch, params: {stack_id: @stack.to_param}
+      get :fetch, params: { stack_id: @stack.to_param }
       assert_response :ok
       data = JSON.parse(response.body)
       assert_includes data, 'ccmenu_url'
@@ -18,12 +19,12 @@ module Shipit
 
     test ":fetch creates a read only api client" do
       assert_difference 'ApiClient.count' do
-        get :fetch, params: {stack_id: @stack.to_param}
+        get :fetch, params: { stack_id: @stack.to_param }
       end
     end
 
     test ":fetch url includes api token on query string" do
-      get :fetch, params: {stack_id: @stack.to_param}
+      get :fetch, params: { stack_id: @stack.to_param }
       data = JSON.parse(response.body)
       client = ApiClient.last
       query = Rack::Utils.parse_nested_query(URI(data['ccmenu_url']).query)

data/test/controllers/commit_checks_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -12,7 +13,7 @@ module Shipit
     end
 
     test ":tail is success" do
-      get :tail, params: {stack_id: @stack.to_param, sha: @commit.sha}
+      get :tail, params: { stack_id: @stack.to_param, sha: @commit.sha }
       assert_response :success
       assert_json 'output', 'foobar'
       assert_json 'url', stack_tail_commit_checks_path(@stack, sha: @commit.sha, since: 6)
@@ -21,14 +22,14 @@ module Shipit
 
     test ":tail doesn't provide another url if the task is finished" do
       @checks.status = 'success'
-      get :tail, params: {stack_id: @stack.to_param, sha: @commit.sha}
+      get :tail, params: { stack_id: @stack.to_param, sha: @commit.sha }
       assert_response :success
       assert_json 'url', nil
     end
 
     test ":tail returns only the output after the provided offset" do
       @checks.status = 'success'
-      get :tail, params: {stack_id: @stack.to_param, sha: @commit.sha, since: 5}
+      get :tail, params: { stack_id: @stack.to_param, sha: @commit.sha, since: 5 }
       assert_response :success
       assert_json 'output', 'r'
     end

data/test/controllers/commits_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -15,7 +16,7 @@ module Shipit
       patch(:update, params: {
         stack_id: @stack.to_param,
         id: @commit.id,
-        commit: {locked: true},
+        commit: { locked: true },
       })
 
       assert_response(:ok)
@@ -30,7 +31,7 @@ module Shipit
       patch(:update, params: {
         stack_id: @stack.to_param,
         id: @commit.id,
-        commit: {locked: false},
+        commit: { locked: false },
       })
 
       assert_response(:ok)

data/test/controllers/deploys_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -12,30 +13,30 @@ module Shipit
     end
 
     test ":show is success" do
-      get :show, params: {stack_id: @stack.to_param, id: @stack.deploys.last.id}
+      get :show, params: { stack_id: @stack.to_param, id: @stack.deploys.last.id }
       assert_response :success
     end
 
     test "deploys can be observed as raw text" do
-      get :show, params: {stack_id: @stack, id: @deploy.id, format: 'txt'}
+      get :show, params: { stack_id: @stack, id: @deploy.id, format: 'txt' }
       assert_response :success
-      assert_equal("text/plain", @response.content_type)
+      assert_equal("text/plain", @response.media_type)
     end
 
     test ":new is success" do
-      get :new, params: {stack_id: @stack.to_param, sha: @commit.sha}
+      get :new, params: { stack_id: @stack.to_param, sha: @commit.sha }
       assert_response :success
     end
 
     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}
+      get :new, params: { stack_id: @stack.to_param, sha: @stack.commits.last.sha }
     end
 
     test ":new shows a warning if a deploy is already running" do
       shipit_deploys(:shipit_running).update!(allow_concurrency: false, status: 'running')
 
-      get :new, params: {stack_id: @stack.to_param, sha: @commit.sha}
+      get :new, params: { stack_id: @stack.to_param, sha: @commit.sha }
       assert_response :success
       assert_select '.warning.concurrent-deploy h2' do |elements|
         assert_equal 'Lando Walrussian is already deploying!', elements.first.text
@@ -43,21 +44,31 @@ module Shipit
       assert_select '#new_deploy #force', 1
     end
 
+    test ":new selects default value" do
+      @stack = shipit_stacks(:shipit_undeployed)
+      get :new, params: { stack_id: @stack.to_param, sha: @stack.commits.last.sha }
+      assert_response :success
+
+      assert_select '.variables-fields option[selected=selected]' do |elements|
+        assert_equal 'us-central', elements.first.text
+      end
+    end
+
     test ":create persists a new deploy" do
       assert_difference '@stack.deploys.count', 1 do
-        post :create, params: {stack_id: @stack.to_param, deploy: {until_commit_id: @commit.id}}
+        post :create, params: { stack_id: @stack.to_param, deploy: { until_commit_id: @commit.id } }
       end
     end
 
     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}}
+      env = { 'SAFETY_DISABLED' => '1' }
+      post :create, params: { stack_id: @stack.to_param, deploy: { until_commit_id: @commit.id, env: env } }
       new_deploy = Deploy.last
       assert_equal env, new_deploy.env
     end
 
     test ":create ignore :env keys not declared in the deploy spec" do
-      post :create, params: {stack_id: @stack.to_param, deploy: {until_commit_id: @commit.id, env: {'H4X0R' => '1'}}}
+      post :create, params: { stack_id: @stack.to_param, deploy: { until_commit_id: @commit.id, env: { 'H4X0R' => '1' } } }
       new_deploy = Deploy.last
       assert_equal({}, new_deploy.env)
     end
@@ -66,7 +77,7 @@ module Shipit
       shipit_deploys(:shipit_running).update_column(:status, 'running')
 
       assert_difference '@stack.deploys.count', 1 do
-        post :create, params: {stack_id: @stack.to_param, deploy: {until_commit_id: @commit.id}, force: 'true'}
+        post :create, params: { stack_id: @stack.to_param, deploy: { until_commit_id: @commit.id }, force: 'true' }
       end
     end
 
@@ -74,26 +85,26 @@ module Shipit
       shipit_deploys(:shipit_running).update!(allow_concurrency: false, status: 'running')
 
       assert_no_difference '@stack.deploys.count' do
-        post :create, params: {stack_id: @stack.to_param, deploy: {until_commit_id: @commit.id}}
+        post :create, params: { stack_id: @stack.to_param, deploy: { until_commit_id: @commit.id } }
       end
       assert_redirected_to new_stack_deploy_path(@stack, sha: @commit.sha)
     end
 
     test ":create redirects to the new deploy" do
-      post :create, params: {stack_id: @stack.to_param, deploy: {until_commit_id: @commit.id}}
+      post :create, params: { stack_id: @stack.to_param, deploy: { until_commit_id: @commit.id } }
       new_deploy = Deploy.last
       assert_redirected_to stack_deploy_path(@stack, new_deploy)
     end
 
     test ":rollback is success" do
-      get :rollback, params: {stack_id: @stack.to_param, id: @deploy.id}
+      get :rollback, params: { stack_id: @stack.to_param, id: @deploy.id }
       assert_response :success
     end
 
     test ":rollback shows a warning if a deploy is already running" do
       shipit_deploys(:shipit_running).update!(allow_concurrency: false, status: 'running')
 
-      get :rollback, params: {stack_id: @stack.to_param, id: @deploy.id}
+      get :rollback, params: { stack_id: @stack.to_param, id: @deploy.id }
       assert_response :success
       assert_select '.warning.concurrent-deploy h2' do |elements|
         assert_equal 'Lando Walrussian is already deploying!', elements.first.text
@@ -118,13 +129,13 @@ module Shipit
 
       rollback_commit = @stack.commits.where(id: 2).first
 
-      get :show, params: {stack_id: @stack, id: latest_deploy.id, format: 'html'}
+      get :show, params: { stack_id: @stack, id: latest_deploy.id, format: 'html' }
 
       expected_result = "Abort and Rollback to <span class=\"short-sha-no-bg\">#{rollback_commit.short_sha}</span>"
       expected_rolling_back_element = "Aborting with Rollback... to <span class=\"short-sha-no-bg\">#{rollback_commit.short_sha}</span>"
 
-      assert_select 'span.caption--ready', {html: expected_result}, "rollback button element was not found, or did not match the expected result of '#{expected_result}'"
-      assert_select 'span.caption--pending', {html: expected_rolling_back_element}, "ready rollback button element was not found, or did not match the expected result of '#{expected_rolling_back_element}'"
+      assert_select 'span.caption--ready', { html: expected_result }, "rollback button element was not found, or did not match the expected result of '#{expected_result}'"
+      assert_select 'span.caption--pending', { html: expected_rolling_back_element }, "ready rollback button element was not found, or did not match the expected result of '#{expected_rolling_back_element}'"
     end
 
     test ":rollback (regression) works correctly when a previous deploy is not found" do
@@ -140,17 +151,17 @@ module Shipit
 
       rollback_commit = @stack.commits.where(id: rollback_commit_id).take
 
-      get :show, params: {stack_id: @stack, id: latest_deploy.id, format: 'html'}
+      get :show, params: { stack_id: @stack, id: latest_deploy.id, format: 'html' }
 
       expected_result = "Abort and Rollback to <span class=\"short-sha-no-bg\">#{rollback_commit.short_sha}</span>"
       expected_rolling_back_element = "Aborting with Rollback... to <span class=\"short-sha-no-bg\">#{rollback_commit.short_sha}</span>"
 
-      assert_select 'span.caption--ready', {html: expected_result}, "rollback button element was not found, or did not match the expected result of '#{expected_result}'"
-      assert_select 'span.caption--pending', {html: expected_rolling_back_element}, "ready rollback button element was not found, or did not match the expected result of '#{expected_rolling_back_element}'"
+      assert_select 'span.caption--ready', { html: expected_result }, "rollback button element was not found, or did not match the expected result of '#{expected_result}'"
+      assert_select 'span.caption--pending', { html: expected_rolling_back_element }, "ready rollback button element was not found, or did not match the expected result of '#{expected_rolling_back_element}'"
     end
 
     test ":revert redirect to the proper rollback page" do
-      get :revert, params: {stack_id: @stack.to_param, id: shipit_deploys(:shipit2).id}
+      get :revert, params: { stack_id: @stack.to_param, id: shipit_deploys(:shipit2).id }
       assert_redirected_to rollback_stack_deploy_path(@stack, shipit_deploys(:shipit))
     end
   end

data/test/controllers/github_authentication_controller_test.rb

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

data/test/controllers/merge_status_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -9,27 +10,27 @@ module Shipit
     end
 
     test "GET show" do
-      get :show, params: {referrer: 'https://github.com/Shopify/shipit-engine/pull/42', branch: 'master'}
+      get :show, params: { referrer: 'https://github.com/Shopify/shipit-engine/pull/42', branch: 'master' }
       assert_response :ok
       assert_includes response.body, 'Ready to ship!'
     end
 
     test "GET show when there is no matching stacks" do
-      get :show, params: {referrer: 'https://github.com/Shopify/unknown-repo/pull/42', branch: 'master'}
+      get :show, params: { referrer: 'https://github.com/Shopify/unknown-repo/pull/42', branch: 'master' }
       assert_response :ok
       assert_predicate response.body, :blank?
     end
 
     test "GET anonymous show returns a login message" do
       session.delete(:user_id)
-      get :show, params: {referrer: 'https://github.com/Shopify/shipit-engine/pull/42', branch: 'master'}
+      get :show, params: { referrer: 'https://github.com/Shopify/shipit-engine/pull/42', branch: 'master' }
       assert_response :ok
       assert_includes response.body.downcase, 'please log in'
     end
 
     test "GET anonymous show when there is no matching stack is blank" do
       session.delete(:user_id)
-      get :show, params: {referrer: 'https://github.com/Shopify/unknown-repo/pull/42', branch: 'master'}
+      get :show, params: { referrer: 'https://github.com/Shopify/unknown-repo/pull/42', branch: 'master' }
       assert_response :ok
       assert_predicate response.body, :blank?
     end
@@ -37,21 +38,38 @@ module Shipit
     test "GET show prefers stacks with merge_queue_enabled" do
       existing = shipit_stacks(:shipit)
       Shipit::Stack.where(
-        repo_owner: existing.repo_owner,
-        repo_name: existing.repo_name,
+        repository: existing.repository,
       ).update_all(merge_queue_enabled: false)
 
       Shipit::Stack.create(
-        repo_owner: existing.repo_owner,
-        repo_name: existing.repo_name,
+        repository: existing.repository,
         environment: 'foo',
         branch: existing.branch,
         merge_queue_enabled: true,
       )
 
-      get :show, params: {referrer: 'https://github.com/Shopify/shipit-engine/pull/42', branch: 'master'}
+      get :show, params: { referrer: 'https://github.com/Shopify/shipit-engine/pull/42', branch: 'master' }
       assert_response :ok
       assert_includes response.body, 'shipit-engine/foo'
     end
+
+    test "GET show prefers locked stacks above all else" do
+      existing = shipit_stacks(:shipit)
+      Shipit::Stack.where(
+        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
+      Shipit::Stack.create(
+        repository: existing.repository,
+        environment: 'foo',
+        branch: existing.branch,
+        merge_queue_enabled: true,
+      )
+
+      get :show, params: { referrer: 'https://github.com/Shopify/shipit-engine/pull/42', branch: 'master' }
+      assert_response :ok
+      assert_includes response.body, 'locked'
+    end
   end
 end

data/test/controllers/pull_requests_controller_test.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'test_helper'
 
 module Shipit
@@ -9,21 +10,21 @@ module Shipit
     end
 
     test "#index shows pending pull requests" do
-      get :index, params: {stack_id: @stack.to_param}
+      get :index, params: { stack_id: @stack.to_param }
       assert_response :success
       assert_select '.pr-list .pr', @stack.pull_requests.pending.count
     end
 
     test "#add can enqueue a pull request" do
       assert_difference -> { PullRequest.count }, +1 do
-        post :create, params: {stack_id: @stack.to_param, number_or_url: '#5'}
+        post :create, params: { stack_id: @stack.to_param, number_or_url: '#5' }
       end
       assert_redirected_to stack_pull_requests_path(@stack)
     end
 
     test "#destroy can cancel a pending pull request" do
       assert_predicate @pr, :pending?
-      delete :destroy, params: {stack_id: @stack.to_param, id: @pr.id}
+      delete :destroy, params: { stack_id: @stack.to_param, id: @pr.id }
       assert_redirected_to stack_pull_requests_path(@stack)
       assert_predicate @pr.reload, :canceled?
     end