shipit-engine 0.20.0 → 0.21.0

data/app/models/shipit/task_definition.rb

@@ -4,13 +4,13 @@ module Shipit
 
     class << self
       def load(payload)
-        return unless payload.present?
+        return if payload.blank?
         json = JSON.parse(payload)
         new(json.delete('id'), json)
       end
 
       def dump(definition)
-        return unless definition.present?
+        return if definition.blank?
         JSON.dump(definition.as_json)
       end
     end

data/app/models/shipit/undeployed_commit.rb

@@ -9,9 +9,15 @@ module Shipit
 
     def deploy_state(bypass_safeties = false)
       state = deployable? ? 'allowed' : status.state
+
       unless bypass_safeties
-        state = 'deploying' if stack.active_task?
-        state = 'locked' if locked?
+        if blocked?
+          state = 'blocked'
+        elsif locked?
+          state = 'locked'
+        elsif stack.active_task?
+          state = 'deploying'
+        end
       end
       state
     end
@@ -31,5 +37,10 @@ module Shipit
     def deploy_discouraged?
       stack.maximum_commits_per_deploy && index >= stack.maximum_commits_per_deploy
     end
+
+    def blocked?
+      return @blocked if defined?(@blocked)
+      @blocked = super
+    end
   end
 end

data/app/models/shipit/user.rb

@@ -71,7 +71,7 @@ module Shipit
     end
 
     def refresh_from_github!
-      update!(github_user: Shipit.github_api.user(login))
+      update!(github_user: Shipit.github_api.user(github_id))
     rescue Octokit::NotFound
       identify_renamed_user!
     end

data/app/serializers/shipit/pull_request_serializer.rb

@@ -7,7 +7,7 @@ module Shipit
     has_one :head, serializer: ShortCommitSerializer
 
     attributes :id, :number, :title, :github_id, :additions, :deletions, :state, :merge_status, :mergeable,
-               :merge_requested_at, :rejection_reason, :html_url
+               :merge_requested_at, :rejection_reason, :html_url, :branch, :base_ref
 
     def html_url
       github_pull_request_url(object)

data/app/serializers/shipit/tail_task_serializer.rb

@@ -11,7 +11,7 @@ module Shipit
     end
 
     def include_url?
-      !url.blank?
+      url.present?
     end
 
     def output

data/app/views/shipit/ccmenu/project.xml.builder

@@ -2,12 +2,13 @@
 status_map = {'backlogged' => 'failure', 'locked' => 'failure'}
 xml.instruct!
 xml.Projects do
-  xml.Project '', {
-    :name => stack.to_param,
-    :lastBuildStatus => status_map.fetch(stack.merge_status, stack.merge_status).capitalize,
-    :activity => deploy.running? ? 'Building' : 'Sleeping',
-    :lastBuildTime => deploy.ended_at || deploy.started_at || deploy.created_at,
-    :lastBuildLabel => deploy.id,
-    :webUrl => stack_url(stack),
-  }
+  xml.Project(
+    '',
+    name: stack.to_param,
+    lastBuildStatus: status_map.fetch(stack.merge_status, stack.merge_status).capitalize,
+    activity: deploy.running? ? 'Building' : 'Sleeping',
+    lastBuildTime: deploy.ended_at || deploy.started_at || deploy.created_at,
+    lastBuildLabel: deploy.id,
+    webUrl: stack_url(stack),
+  )
 end

data/app/views/shipit/deploys/_deploy.html.erb

@@ -5,9 +5,9 @@
     <% cache deploy.author do %>
       <%= render 'shipit/shared/author', author: deploy.author %>
     <% end %>
-    <a href="<%= stack_deploy_path(@stack, deploy) %>" class="status status--<%= deploy.status %>" data-tooltip="<%= deploy.status.capitalize %>">
+    <a href="<%= stack_deploy_path(@stack, deploy) %>" class="status status--<%= deploy.status %>" data-tooltip="<%= deploy_status_in_words(deploy.status) %>">
       <i class="status__icon"></i>
-      <span class="visually-hidden"><%= deploy.status %></span>
+      <span class="visually-hidden"><%= deploy_status_in_words(deploy.status) %></span>
     </a>
     <div class="commit-details">
       <span class="commit-title">
@@ -21,6 +21,7 @@
         <span class="code-additions">+<%= deploy.additions %></span>
         <span class="code-deletions">-<%= deploy.deletions %></span>
         <% if deploy.ignored_safeties? %><span class="ignored-safeties">ignoring safeties</span><% end %>
+        <% if deploy.aborted_by %><span class="aborted-by">aborted by <%= deploy.aborted_by.login %></span><% end %>
       </p>
       <p class="commit-meta">
         <% if read_only %>

data/app/views/shipit/stacks/_banners.html.erb

@@ -36,7 +36,10 @@
       <div class="banner__content">
         <h2 class="banner__title">
           <i class="icon icon--lock"></i>
-          Deploys are locked by <%= stack.lock_author.name %>
+          Deploys were locked by <%= stack.lock_author.name %>
+          <% unless stack.locked_since.nil? %>
+            <%= timeago_tag(stack.locked_since, force: true) %>
+          <% end %>
         </h2>
         <p class="banner__text">
           <%= auto_link emojify(stack.lock_reason) %>

data/app/views/shipit/stacks/settings.html.erb

@@ -13,6 +13,10 @@
           <%= f.text_field :environment, placeholder: 'production' %>
         </div>
 
+        <div class="field-wrapper">
+          <span>Branch: <%= @stack.branch %></span>
+        </div>
+
         <div class="field-wrapper">
           <%= f.label :deploy_url, 'Deploy URL (Where is this stack deployed to?)' %>
           <%= f.text_field :deploy_url, placeholder: 'https://' %>

data/app/views/shipit/statuses/_group.html.erb

@@ -9,7 +9,7 @@
     <% group.statuses.each do |status| %>
       <div class="status-item status-item--<%= status.state %> <%= :ignored if status.allowed_to_fail? %>">
         <i class="status-item__icon"></i>
-        <a href="<%= status.target_url %>" target="_blank">
+        <a href="<%= status.target_url %>" <% unless status.target_url.present? %> disabled class="disabled" <% end %> target="_blank">
           <strong class="status-item__service"><%= status.context %></strong>
         </a>
         <span class="status-item__description">&mdash; <%= status.description %></span>

data/app/views/shipit/statuses/_status.html.erb

@@ -1,4 +1,4 @@
-<a class="status status--<%= status.state %> <%= :disabled unless status.target_url.present? %>" <% unless status.group? %>data-tooltip="<%= status.description.presence || status.state.capitalize %>"<% end %> href="<%= status.target_url%>" target="_blank">
+<a class="status status--<%= status.state %> <%= 'disabled' unless status.target_url.present? %>" <%= 'disabled' unless status.target_url.present? %> <% unless status.group? %>data-tooltip="<%= status.description.presence || status.state.capitalize %>"<% end %> href="<%= status.target_url%>" target="_blank">
   <i class="status__icon"></i>
   <span class="visually-hidden"><%= status.state %></span>
 </a>

data/app/views/shipit/tasks/_task.html.erb

@@ -26,8 +26,7 @@
         <% else %>
           <%= timeago_tag(task.created_at, force: true) %>
         <% end %>
-        
       </p>
     </div>
   </li>
-<% end %>
+<% end %>

data/config/locales/en.yml

@@ -27,6 +27,7 @@ en:
   deploy_button:
     hint:
       max_commits: It is recommended not to deploy more than %{maximum} commits at once.
+      blocked: This commit range includes a commit that can't be deployed.
     caption:
       pending: Pending CI
       failure: Failing CI
@@ -36,6 +37,7 @@ en:
       deploying: A Deploy is in Progress
       allowed: Deploy
       missing: Missing CI
+      blocked: Blocked
   redeploy_button:
     caption:
       deploying: A Deploy is in Progress

data/config/secrets.development.example.yml

@@ -13,10 +13,6 @@ github_oauth:
   secret:
   # teams: # Optional
 
-# To work on the beta bootstrap re-write
-# features:
-#   - bootstrap
-
 # To work on the kubernetes deploy script
 # env:
 #   KUBECONFIG: # Path of the kubeconfig you want to use.

data/config/secrets.development.shopify.yml

@@ -1,4 +1,4 @@
-host: 'http://shipit-engine.localhost'
+host: 'https://shipit-engine.myshopify.io'
 redis_url: 'redis://shipit-engine.railgun:6379'
 
 github_api:
@@ -13,10 +13,6 @@ github_oauth:
   secret:
   # teams: # Optional
 
-# To work on the beta bootstrap re-write
-# features:
-#   - bootstrap
-
 # To work on the kubernetes deploy script
 # env:
 #   KUBECONFIG: # Path of the kubeconfig you want to use.

data/db/migrate/20170904103242_reindex_deliveries.rb

@@ -0,0 +1,7 @@
+class ReindexDeliveries < ActiveRecord::Migration[5.1]
+  def change
+    add_index :deliveries, [:hook_id, :status]
+    remove_index :deliveries, [:created_at]
+    remove_index :deliveries, [:status, :event]
+  end
+end

data/db/migrate/20171120161420_add_base_info_to_pull_request.rb

@@ -0,0 +1,7 @@
+class AddBaseInfoToPullRequest < ActiveRecord::Migration[5.1]
+  def change
+    add_column :pull_requests, :base_ref, :string, limit: 1024
+    add_column :pull_requests, :base_commit_id, :integer
+    add_foreign_key :pull_requests, :commits, column: :base_commit_id
+  end
+end

data/db/migrate/20180202220850_add_aborted_by_to_tasks.rb

@@ -0,0 +1,5 @@
+class AddAbortedByToTasks < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tasks, :aborted_by_id, :integer
+  end
+end

data/lib/shipit/command.rb

@@ -8,11 +8,19 @@ module Shipit
     MAX_READ = 64.kilobytes
 
     Error = Class.new(StandardError)
-    Failed = Class.new(Error)
     NotFound = Class.new(Error)
     Denied = Class.new(Error)
     TimedOut = Class.new(Error)
 
+    class Failed < Error
+      attr_reader :exit_code
+
+      def initialize(message, exit_code)
+        super(message)
+        @exit_code = exit_code
+      end
+    end
+
     attr_reader :out, :code, :chdir, :env, :args, :pid, :timeout
 
     def initialize(*args, default_timeout: Shipit.default_inactivity_timeout, env: {}, chdir:)
@@ -44,7 +52,7 @@ module Shipit
     end
 
     def success?
-      code == 0
+      !code.nil? && code.zero?
     end
 
     def exit_message
@@ -121,7 +129,7 @@ module Shipit
 
     def stream!(&block)
       stream(&block)
-      raise Failed.new(exit_message) unless success?
+      raise Failed.new(exit_message, code) unless success?
       self
     end
 

data/lib/shipit/engine.rb

@@ -1,5 +1,3 @@
-require 'bootstrap'
-
 module Shipit
   class Engine < ::Rails::Engine
     isolate_namespace Shipit
@@ -17,8 +15,6 @@ module Shipit
         task.js
         shipit.js
         shipit.css
-        shipit_bs.js
-        shipit_bs.css
       )
       app.config.assets.precompile << proc do |path|
         path =~ %r{\Aplugins/[\-\w]+\.(js|css)\Z}

data/lib/shipit/stack_commands.rb

@@ -26,7 +26,7 @@ module Shipit
     end
 
     def fetch_deployed_revision
-      with_temporary_working_directory do |dir|
+      with_temporary_working_directory(commit: @stack.commits.last) do |dir|
         spec = DeploySpec::FileSystem.new(dir, @stack.environment)
         outputs = spec.fetch_deployed_revision_steps!.map do |command_line|
           Command.new(command_line, env: env, chdir: dir).run
@@ -42,6 +42,8 @@ module Shipit
     end
 
     def with_temporary_working_directory(commit: nil)
+      commit ||= @stack.last_deployed_commit.presence || @stack.commits.last
+
       @stack.acquire_git_cache_lock do
         if !commit || !fetched?(commit).tap(&:run).success?
           fetch.run!

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.20.0'.freeze
+  VERSION = '0.21.0'.freeze
 end

data/lib/shipit.rb

@@ -30,8 +30,6 @@ require 'faraday-http-cache'
 
 require 'shipit/version'
 
-require 'shipit/template_renderer_extension'
-
 require 'shipit/paginator'
 require 'shipit/null_serializer'
 require 'shipit/csv_serializer'
@@ -56,8 +54,9 @@ module Shipit
 
   delegate :table_name_prefix, to: :secrets
 
-  attr_accessor :disable_api_authentication
-  attr_writer :automatically_prepend_bundle_exec
+  attr_accessor :disable_api_authentication, :timeout_exit_codes
+
+  self.timeout_exit_codes = [].freeze
 
   def app_name
     @app_name ||= secrets.app_name || Rails.application.class.name.split(':').first || 'Shipit'
@@ -138,6 +137,18 @@ module Shipit
     secrets.host.presence
   end
 
+  def enforce_publish_config
+    secrets.enforce_publish_config.presence
+  end
+
+  def npm_org_scope
+    secrets.npm_org_scope.presence
+  end
+
+  def private_npm_registry
+    secrets.private_npm_registry.presence
+  end
+
   def github_teams
     @github_teams ||= github_teams_handles.map { |t| Team.find_or_create_by_handle(t) }
   end
@@ -195,29 +206,10 @@ module Shipit
     end
   end
 
-  def feature_bootstrap?
-    secrets.features.try!(:include?, 'bootstrap')
-  end
-
-  def bootstrap_view_path
-    @bootstrap_view_path ||= Engine.root.join('app/views/bootstrap')
-  end
-
   def default_inactivity_timeout
     secrets.commands_inactivity_timeout || 5.minutes.to_i
   end
 
-  def automatically_prepend_bundle_exec
-    unless defined?(@automatically_prepend_bundle_exec)
-      ActiveSupport::Deprecation.warn(
-        'Automatically prepending `bundle exec` will be removed in a future version of Shipit, '\
-        'set `Shipit.automatically_prepend_bundle_exec = false` to test the new behaviour.',
-      )
-      @automatically_prepend_bundle_exec = true
-    end
-    @automatically_prepend_bundle_exec
-  end
-
   protected
 
   def revision_file

data/lib/snippets/assert-lerna-fixed-version-tag

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+VERSION=$(node --eval "console.log(require('./lerna.json').version);")
+echo -e "\033[0;32mTrying to publish version $VERSION\033[0m"
+
+git tag | grep "^v$VERSION$" > /dev/null
+if [ $? != '0' ]; then
+  echo -e "\033[1;31mYou need to create the \033[0;33mv$VERSION\033[1;31m tag first.\033[0m"
+  exit 1
+fi
+
+TAG_REV=$(git rev-list -n1 "v$VERSION")
+HEAD_REV=$(git rev-parse HEAD)
+
+if [ "$TAG_REV" != "$HEAD_REV" ]; then
+  echo -e "\033[1;31mYou're attempting to publish \033[0;33m$HEAD_REV\033[1;31m as \033[0;33mv$VERSION\033[1;31m but it already points to \033[0;33m$TAG_REV\033[1;31m.\033[0m"
+  exit 1
+fi
+
+echo -e "\033[0;32mAll clear!\033[0m"
+exit 0

data/lib/snippets/assert-lerna-independent-version-tags

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+TAGS=$(git tag --points-at HEAD)
+
+if [ -z "$TAGS" ]; then
+  HEAD_REV=$(git rev-parse HEAD)
+  echo -e "\033[1;31mNo tags associated with $HEAD_REV.  Did you push your commits and tags?\033[0m"
+  exit 1
+fi
+
+for TAG in $TAGS
+do
+  if [[ "${TAG}" == @* ]]; then
+    TAG=$(echo "$TAG" | cut -d \/ -f 2)
+  fi
+
+  PACKAGE_NAME=$(echo "$TAG" | cut -d \@ -f 1)
+  TAG_PACKAGE_VERSION=$(echo "$TAG" | cut -d \@ -f 2)
+  ACTUAL_PACKAGE_VERSION=$(node -e "console.log(require('./packages/$PACKAGE_NAME/package.json').version)")
+
+  if [ "$TAG_PACKAGE_VERSION" != "$ACTUAL_PACKAGE_VERSION" ]; then
+    echo -e "\033[1;31m$PACKAGE_NAME is tagged as $TAG_PACKAGE_VERSION, but its package.json version is $ACTUAL_PACKAGE_VERSION.\033[0m"
+    exit 1
+  fi
+done
+
+echo -e "\033[0;32mAll clear!\033[0m"
+exit 0

data/lib/snippets/generate-local-npmrc

@@ -0,0 +1,19 @@
+#!/usr/bin/env node
+const {resolve} = require('path');
+const {existsSync, writeFileSync, readFileSync} = require('fs');
+const npmrc = resolve('.', '.npmrc');
+const npmrcContents = process.argv[2];
+
+if (!npmrcContents) {
+  console.error('npmrc contents not specified.');
+  process.exit(1);
+}
+
+if (existsSync(npmrc)) {
+  console.log('.npmrc already exists.')
+} else {
+  writeFileSync(npmrc, npmrcContents)
+
+  console.log('\nGenerated .npmrc:');
+  console.log(readFileSync(npmrc, {encoding: 'utf8'}))
+}

data/lib/snippets/misconfigured-npm-publish-config

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+echo -e "\033[1;31m Misconfigured package.json, please ensure the following has been met:\n \033[0m"
+
+echo -e "\033[1;31m * Please add a publishConfig with an access setting in your package.json.  e.g.,\033[0m"
+echo -e "\n\033[1;31m\t\"publishConfig:\" {\n\t   \"access\": \"<public|restricted>\" \n\t} \033[0m"
+echo -e "\n\033[1;31m * If your package is private, ensure your the package name is scoped (@organization/package) \033[0m"
+exit 1

data/lib/snippets/publish-lerna-independent-packages

@@ -0,0 +1,39 @@
+#!/usr/bin/env node
+const {resolve} = require('path');
+const {execSync} = require('child_process')
+const Repository = require(resolve('.', 'node_modules', 'lerna', 'lib', 'Repository'));
+const PackageUtilities = require(resolve('.', 'node_modules', 'lerna', 'lib', 'PackageUtilities'));
+
+function npmTag(version) {
+  const isNext = ['-beta', '-alpha', '-rc', '-next'].some(distributionType =>
+    version.includes(distributionType),
+  );
+  return isNext ? 'next' : 'latest';
+}
+
+const taggedPackages = execSync('git tag --points-at HEAD')
+  .toString()
+  .trim()
+  .split('\n')
+  .map(tag => {
+    if (tag.startsWith('@')) {
+      return `@${tag.split('@')[1]}`;
+    }
+    return tag.split('@')[0];
+  });
+
+const repository = new Repository('.');
+const unsortedPackages = PackageUtilities.getPackages({rootPath: '.', packageConfigs: repository.packageConfigs});
+const packages = PackageUtilities.topologicallyBatchPackages(unsortedPackages, true)
+  .reduce((acc, packageGroup) => [...acc, ...packageGroup], [])
+  .filter(({name}) => taggedPackages.includes(name));
+
+packages.forEach(({name, version}) => {
+  const command = `node_modules/.bin/lerna publish --yes --npm-client=npm --skip-npm=false --skip-git --force-publish=${name} --repo-version=${version} --scope=${name} --npm-tag=${npmTag(
+    version,
+  )}`;
+
+  // eslint-disable-next-line no-console
+  console.log(command);
+  require('child_process').execSync(command);
+});

data/lib/snippets/push-to-heroku

@@ -23,17 +23,17 @@ if [[ -z "${HEROKU_APP}" ]]; then
   exit 1;
 fi
 
-echo "$HEROKU_RELEASES" | head -n2 | tail -n1 | grep '^\(v[0-9]\+\)' >/dev/null
+echo "$HEROKU_RELEASES" | grep 'Current: \(v[0-9]\+\)' >/dev/null
 
 if [[ $? -ne 0 ]]; then
   red "Error detecting current heroku release. Message from 'heroku releases':"
   echo "${HEROKU_RELEASES}"
   red "Please contact a heroku collaborator for ${HEROKU_APP}:"
-  heroku sharing --app $HEROKU_APP
+  heroku access --app $HEROKU_APP
   exit 1;
 fi
 
-HEROKU_LAST_GOOD_RELEASE=`echo "$HEROKU_RELEASES" | head -n2 | tail -n1 | sed -e 's/^\(v[0-9]\+\).*/\1/'`
+HEROKU_LAST_GOOD_RELEASE=`echo "$HEROKU_RELEASES" | grep 'Current: \(v[0-9]\+\)' | sed -e 's/.*\(v[0-9]\+\).*/\1/'`
 green "Current heroku release: ${HEROKU_LAST_GOOD_RELEASE}"
 
 green "Pushing to heroku."
@@ -41,7 +41,7 @@ $GIT_COMMAND
 if [[ $? -ne 0 ]]; then
   red "Heroku push rejected. See message above."
   red "Please contact a heroku collaborator for ${HEROKU_APP}:"
-  heroku sharing --app $HEROKU_APP
+  heroku access --app $HEROKU_APP
   exit 1;
 fi
 
@@ -58,7 +58,7 @@ if [[ "${MIGRATION_STATUS}" != "" ]]; then
   if [[ "${POST_MIGRATION_STATUS}" != "" ]]; then
     red "Migration failed! This is bad."
     red "Please contact a heroku collaborator for ${HEROKU_APP}:"
-    heroku sharing --app $HEROKU_APP
+    heroku access --app $HEROKU_APP
     red "The app ${HEROKU_APP} will now be reverted to its last working version ${HEROKU_LAST_GOOD_RELEASE}."
     heroku releases:rollback $HEROKU_LAST_GOOD_RELEASE --app $HEROKU_APP
     red "Abort."

data/lib/tasks/cron.rake

@@ -7,7 +7,7 @@ namespace :cron do
     Shipit::PullRequest.schedule_merges
   end
 
-  task hourly: [:rollup, :refresh_users]
+  task hourly: %i(rollup refresh_users)
 
   desc "Rolls-up output chunks for completed deploys older than an hour"
   task rollup: :environment do

data/lib/tasks/dev.rake

@@ -15,7 +15,7 @@ namespace :dev do
 
     loop do
       sentence = Faker::Lorem.sentence.split.map do |word|
-        if rand(4) == 0
+        if rand(4).zero?
           "\e[#{rand(30..37)}m#{word}\e[0m"
         else
           word

data/test/controllers/api/deploys_controller_test.rb

@@ -40,6 +40,13 @@ module Shipit
         deploy.user == @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}
+        deploy = Deploy.last
+        assert_equal deploy.user, @user
+      end
+
       test "#create renders a 422 if the sha isn't found" do
         post :create, params: {stack_id: @stack.to_param, sha: '123443543545'}
         assert_response :unprocessable_entity
@@ -52,6 +59,18 @@ module Shipit
         assert_json 'errors', 'sha' => ['is too short (minimum is 6 characters)']
       end
 
+      test "#create renders a 409 if a concurrent task is already running" do
+        assert_difference -> { @stack.deploys.count }, 1 do
+          post :create, params: {stack_id: @stack.to_param, sha: @commit.sha}
+        end
+
+        assert_no_difference -> { @stack.deploys.count } do
+          post :create, params: {stack_id: @stack.to_param, sha: @commit.sha}
+        end
+
+        assert_response :conflict
+      end
+
       test "#create refuses to deploy locked stacks" do
         @stack.update!(lock_reason: 'Something broken')
 

data/test/controllers/api/stacks_controller_test.rb

@@ -60,7 +60,7 @@ module Shipit
         assert_response :ok
         assert_json '0.id', stack.id
         assert_json do |stacks|
-          assert_equal 3, stacks.size
+          assert_equal Stack.count, stacks.size
         end
       end
 

data/test/controllers/github_authentication_controller_test.rb

@@ -24,7 +24,7 @@ module Shipit
         get :callback
       end
 
-      user = User.find_by_login('shipit-user')
+      user = User.find_by(login: 'shipit-user')
       assert_equal 's3cr3t', user.github_access_token
       assert_equal 44, user.github_id
     end

data/test/controllers/stacks_controller_test.rb

@@ -149,6 +149,11 @@ module Shipit
       assert_redirected_to stack_settings_path(@stack)
     end
 
+    test "#sync_webhooks displays a flash message" do
+      post :sync_webhooks, params: {id: @stack.to_param}
+      assert_equal 'Webhooks syncing scheduled', flash[:success]
+    end
+
     test "#clear_git_cache queues a ClearGitCacheJob" do
       assert_enqueued_with(job: ClearGitCacheJob, args: [@stack]) do
         post :clear_git_cache, params: {id: @stack.to_param}
@@ -156,6 +161,11 @@ module Shipit
       assert_redirected_to stack_settings_path(@stack)
     end
 
+    test "#clear_git_cache displays a flash message" do
+      post :clear_git_cache, params: {id: @stack.to_param}
+      assert_equal 'Git Cache clearing scheduled', flash[:success]
+    end
+
     test "#update redirects to return_to parameter" do
       patch :update, params: {id: @stack.to_param, stack: {ignore_ci: false}, return_to: stack_path(@stack)}
       assert_redirected_to stack_path(@stack)