shipit-engine 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e59f9e4da5a153b86f3a4e001457f0ca9fa43f9
-  data.tar.gz: fb56ea8afef030852bb331ce12a8fb5db9a40234
+  metadata.gz: 13126d19eca4966f56856152cf632751bf1ba9d1
+  data.tar.gz: 665a8bce4eb15e193e55b0da971a5840b7888bf6
 SHA512:
-  metadata.gz: 505e87e04f14fbfb8403dfd95a868a536d6666e8fd32fc88894cd51d3b720a7a37cff6de7bb36290438d6ecf8b7795abc0317b8594d070b8adf837cae50b2259
-  data.tar.gz: 331f978493b326520897b4ebeb29eb23ce75e8224586dfc7a48dd643e56f8405ee825ca956d0f9a1796cf8f14e2ffac40c15b80501f97462ee784fc3d36d2d1e
+  metadata.gz: 87cf3290c48593691fec2c278607cc1783206af426ca3dbefcab269b639614d98e5e8632cd1bc4fa27842f70615886f9b7c3914191d99dfc8168d43ab61ffcae
+  data.tar.gz: 12077a22444887bb58eb55faed2b395e257d97f2a762fc64164ef216b61921c6606d8261de6f202192324b17e461e4b3c9f008d4278503c7631a41513a309ce2

data/README.md

@@ -316,7 +316,7 @@ development:
 
 The value for `id` is your application's  *Client ID*, and the value for `secret` is your application's *Client Secret* — both of these should appear on your application's GitHub page.
 
-The `team` is optional, and required only if you want to specify a team that has access to the stack in Shipit.
+The `teams` key is optional, and required only if you want to specify some teams which have access to the stack in Shipit.
 
 For example:
 
@@ -325,7 +325,9 @@ development:
   github_oauth:
     id: (your application's Client ID)
     secret: (your application's Client Secret)
-    team: Shipit/team
+    teams:
+      - Shipit/team
+      - Shipit/another_team
 ```
 <br>
 

data/app/assets/javascripts/shipit/checklist.js.coffee

@@ -1,9 +1,9 @@
 $document = $(document)
 
 toggleDeployButton = ->
-  $('.trigger-deploy').toggleClass('disabled btn--disabled', !!$(':checkbox[name=checklist]:not(:checked)').length)
+  $('.trigger-deploy').toggleClass('disabled btn--disabled', !!$(':checkbox.required:not(:checked)').length)
 
-$document.on('change', ':checkbox[name=checklist]', toggleDeployButton)
+$document.on('change', ':checkbox.required', toggleDeployButton)
 
 jQuery ($) ->
   toggleDeployButton()

data/app/controllers/shipit/api/hooks_controller.rb

@@ -13,7 +13,7 @@ module Shipit
       end
 
       params do
-        requires :url, String
+        requires :delivery_url, String
         requires :events, Array[String]
         accepts :content_type, String
       end
@@ -22,7 +22,7 @@ module Shipit
       end
 
       params do
-        accepts :url, String
+        accepts :delivery_url, String
         accepts :events, Array[String]
         accepts :content_type, String
       end

data/app/controllers/shipit/shipit_controller.rb

@@ -32,9 +32,10 @@ module Shipit
 
     def force_github_authentication
       if current_user.logged_in?
-        team = Shipit.github_team
-        if team && !current_user.in?(team.members)
-          render text: "You must be a member of #{team.handle} to access this application.", status: :forbidden
+        teams = Shipit.github_teams
+        unless teams.empty? || current_user.teams.where(id: teams).exists?
+          team_list = teams.map(&:handle).to_sentence(two_words_connector: ' or ', last_word_connector: ', or ')
+          render text: "You must be a member of #{team_list} to access this application.", status: :forbidden
         end
       else
         redirect_to Shipit::Engine.routes.url_helpers.github_authentication_path(origin: request.original_url)

data/app/models/shipit/hook.rb

@@ -8,6 +8,7 @@ module Shipit
     }.freeze
 
     EVENTS = %w(
+      stack
       task
       deploy
       rollback
@@ -19,7 +20,7 @@ module Shipit
     belongs_to :stack, required: false
     has_many :deliveries
 
-    validates :url, presence: true, url: {no_local: true, allow_blank: true}
+    validates :delivery_url, presence: true, url: {no_local: true, allow_blank: true}
     validates :content_type, presence: true, inclusion: {in: CONTENT_TYPES.keys}
     validates :events, presence: true, subset: {of: EVENTS}
 
@@ -67,7 +68,7 @@ module Shipit
     def deliver!(event, payload)
       deliveries.create!(
         event: event,
-        url: url,
+        url: delivery_url,
         content_type: CONTENT_TYPES[content_type],
         payload: serialize_payload(payload),
       ).schedule!

data/app/models/shipit/stack.rb

@@ -27,7 +27,10 @@ module Shipit
 
     before_validation :update_defaults
     before_destroy :clear_local_files
-    after_commit :emit_hooks
+    after_commit :emit_lock_hooks
+    after_commit :emit_added_hooks, on: :create
+    after_commit :emit_updated_hooks, on: :update
+    after_commit :emit_removed_hooks, on: :destroy
     after_commit :broadcast_update, on: :update
     after_commit :setup_hooks, :sync_github, on: :create
     after_touch :clear_cache
@@ -296,11 +299,24 @@ module Shipit
       self.branch = 'master' if branch.blank?
     end
 
-    def emit_hooks
+    def emit_lock_hooks
       return unless previous_changes.include?('lock_reason')
       Hook.emit(:lock, self, locked: locked?, stack: self)
     end
 
+    def emit_added_hooks
+      Hook.emit(:stack, self, action: :added, stack: self)
+    end
+
+    def emit_updated_hooks
+      changed = !(previous_changes.keys - %w(updated_at)).empty?
+      Hook.emit(:stack, self, action: :updated, stack: self) if changed
+    end
+
+    def emit_removed_hooks
+      Hook.emit(:stack, self, action: :removed, stack: self)
+    end
+
     def ci_enabled_cache_key
       "stacks:#{id}:ci_enabled"
     end

data/app/models/shipit/user.rb

@@ -2,6 +2,8 @@ module Shipit
   class User < ActiveRecord::Base
     DEFAULT_AVATAR = URI.parse('https://avatars.githubusercontent.com/u/583231?')
 
+    has_many :teams, through: :memberships
+    has_many :memberships
     has_many :authored_commits, class_name: :Commit, foreign_key: :author_id, inverse_of: :author
     has_many :commits, foreign_key: :committer_id, inverse_of: :committer
     has_many :tasks

data/app/serializers/shipit/hook_serializer.rb

@@ -3,7 +3,15 @@ module Shipit
     include ConditionalAttributes
 
     has_one :stack
-    attributes :id, :url, :content_type, :events, :insecure_ssl, :created_at, :updated_at
+    attributes :id, :url, :delivery_url, :content_type, :events, :insecure_ssl, :created_at, :updated_at
+
+    def url
+      if object.scoped?
+        api_stack_hook_url(object.stack, object)
+      else
+        api_hook_url(object)
+      end
+    end
 
     def include_stack?
       object.scoped?

data/app/serializers/shipit/stack_serializer.rb

@@ -3,7 +3,7 @@ module Shipit
     include ConditionalAttributes
 
     has_one :lock_author
-    attributes :id, :repo_owner, :repo_name, :environment, :html_url, :url, :tasks_url, :deploy_spec,
+    attributes :id, :repo_owner, :repo_name, :environment, :html_url, :url, :tasks_url, :deploy_url, :deploy_spec,
                :undeployed_commits_count, :is_locked, :lock_reason, :continuous_deployment, :created_at, :updated_at
 
     def url

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

@@ -6,7 +6,7 @@
   <ul class="deploy-checklist">
     <%- checklist.each_with_index do |check, index| -%>
       <li class="deploy-checklist__item">
-        <%= check_box_tag :checklist, nil, false, class: 'deploy-checklist__item__checkbox', id: "checkbox_#{index}" %>
+        <%= check_box_tag :checklist, nil, false, class: 'deploy-checklist__item__checkbox required', id: "checkbox_#{index}" %>
         <label class="deploy-checklist__item__label" for="checkbox_<%= index %>">
           <%= sanitize(check, tags: %w(a strong), attributes: %w(href target)) %>
         </label>

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

@@ -2,5 +2,9 @@
   <h2><%= render_github_user(@stack.active_deploy.author) %> is already deploying!</h2>
   <ul>
     <li>Are you sure you want to deploy concurrently?</li>
+    <li>
+      <%= check_box_tag :force, true, false, class: 'required' %>
+      Yes I know what I'm doing.
+    </li>
   </ul>
 </section>

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

@@ -1,8 +1,6 @@
 <%= render partial: 'shipit/stacks/header', locals: { stack: @stack } %>
 
 <div class="wrapper">
-  <%= render 'concurrent_deploy_warning' if @stack.deploying? %>
-
   <section>
     <header class="section-header">
       <h2>Commits included in this deploy (<%= link_to_github_deploy(@deploy) %>)</h2>
@@ -45,10 +43,10 @@
         <% end %>
       </section>
     <% end %>
+
+    <%= render 'concurrent_deploy_warning' if @stack.deploying? %>
+
     <section class="submit-section">
-      <% if @stack.deploying? %>
-        <%= hidden_field_tag :force, value: true %>
-      <% end %>
       <%= f.hidden_field :until_commit_id %>
       <%= f.submit class: 'btn btn--primary btn--large trigger-deploy' %>
     </section>

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

@@ -9,8 +9,6 @@
     </ul>
   </section>
 
-  <%= render 'concurrent_deploy_warning' if @stack.deploying? %>
-
   <section>
     <header class="section-header">
       <h2>Commits included in this rollback</h2>
@@ -41,10 +39,10 @@
         <% end %>
       </section>
     <% end %>
+
+    <%= render 'concurrent_deploy_warning' if @stack.deploying? %>
+
     <section class="submit-section">
-      <% if @stack.deploying? %>
-        <%= hidden_field_tag :force, value: true %>
-      <% end %>
       <%= f.hidden_field :parent_id %>
       <%= f.submit 'Rollback', :class => ['btn', 'rollback', 'trigger-rollback'], data: {confirm: "Are you really sure it's safe?"} %>
     </section>

data/config/routes.rb

@@ -5,16 +5,9 @@ Shipit::Engine.routes.draw do
 
   mount Pubsubstub::StreamAction.new, at: "/events", as: :events
 
+  # Robots
   get '/status/version' => 'status#version', as: :version
 
-  scope '/github/auth/github', as: :github_authentication, controller: :github_authentication do
-    get '/', action: :request
-    post :callback
-    get :callback
-    get :logout
-  end
-
-  # Robots
   resources :stacks, only: %i(new create index) do
     resource :webhooks, only: [] do
       post :push, :state
@@ -28,7 +21,35 @@ Shipit::Engine.routes.draw do
     end
   end
 
+  # API
+  namespace :api do
+    root to: 'base#index'
+    resources :stacks, only: :index
+    scope '/stacks/*id', id: stack_id_format, as: :stack do
+      get '/' => 'stacks#show'
+    end
+
+    scope '/stacks/*stack_id', stack_id: stack_id_format, as: :stack do
+      resource :lock, only: %i(create update destroy)
+      resources :tasks, only: %i(index show) do
+        resource :output, only: :show
+      end
+      resources :deploys, only: %i(create)
+      post '/task/:task_name' => 'tasks#trigger', as: :trigger_task
+      resources :hooks, only: %i(index create show update destroy)
+    end
+
+    resources :hooks, only: %i(index create show update destroy)
+  end
+
   # Humans
+  scope '/github/auth/github', as: :github_authentication, controller: :github_authentication do
+    get '/', action: :request
+    post :callback
+    get :callback
+    get :logout
+  end
+
   scope '/*id', id: stack_id_format, as: :stack do
     get '/' => 'stacks#show'
     patch '/' => 'stacks#update'
@@ -64,25 +85,4 @@ Shipit::Engine.routes.draw do
       end
     end
   end
-
-  # API
-  namespace :api do
-    root to: 'base#index'
-    resources :stacks, only: :index
-    scope '/stacks/*id', id: stack_id_format, as: :stack do
-      get '/' => 'stacks#show'
-    end
-
-    scope '/stacks/*stack_id', stack_id: stack_id_format, as: :stack do
-      resource :lock, only: %i(create update destroy)
-      resources :tasks, only: %i(index show) do
-        resource :output, only: :show
-      end
-      resources :deploys, only: %i(create)
-      post '/task/:task_name' => 'tasks#trigger', as: :trigger_task
-      resources :hooks, only: %i(index create show update destroy)
-    end
-
-    resources :hooks, only: %i(index create show update destroy)
-  end
 end

data/db/migrate/20160122165559_rename_hooks_url_in_delivery_url.rb

@@ -0,0 +1,5 @@
+class RenameHooksUrlInDeliveryUrl < ActiveRecord::Migration
+  def change
+    rename_column :hooks, :url, :delivery_url
+  end
+end

data/lib/shipit.rb

@@ -103,8 +103,9 @@ module Shipit
     secrets.host.presence
   end
 
-  def github_team
-    @github_team ||= github_oauth_credentials['team'] && Team.find_or_create_by_handle(github_oauth_credentials['team'])
+  def github_teams
+    teams = (Array(github_oauth_credentials['team']) + Array(github_oauth_credentials['teams'])).sort.uniq
+    @github_teams ||= teams.map { |t| Team.find_or_create_by_handle(t) }
   end
 
   def github_oauth_id

data/lib/shipit/version.rb

@@ -1,3 +1,3 @@
 module Shipit
-  VERSION = '0.6.4'
+  VERSION = '0.7.0'
 end

data/test/controllers/api/hooks_controller_test.rb

@@ -8,13 +8,17 @@ module Shipit
         @stack = shipit_stacks(:shipit)
       end
 
+      test "the route has priority over stacks one" do
+        assert_recognizes({controller: 'shipit/api/hooks', action: 'show', id: '42'}, '/api/hooks/42')
+      end
+
       test "#index without a stack_id returns the list of global hooks" do
         hook = Hook.global.first
 
         get :index
         assert_response :ok
         assert_json '0.id', hook.id
-        assert_json '0.url', hook.url
+        assert_json '0.delivery_url', hook.delivery_url
         assert_json '0.content_type', hook.content_type
         assert_no_json '0.stack'
       end
@@ -25,7 +29,7 @@ module Shipit
         get :index, stack_id: @stack.to_param
         assert_response :ok
         assert_json '0.id', hook.id
-        assert_json '0.url', hook.url
+        assert_json '0.delivery_url', hook.delivery_url
         assert_json '0.content_type', hook.content_type
         assert_json '0.stack.id', @stack.id
       end
@@ -37,35 +41,39 @@ module Shipit
         assert_response :ok
 
         assert_json 'id', hook.id
-        assert_json 'url', hook.url
+        assert_json 'delivery_url', hook.delivery_url
         assert_json 'content_type', hook.content_type
         assert_json 'stack.id', @stack.id
       end
 
       test "#create adds a new hook" do
         assert_difference -> { Hook.count }, 1 do
-          post :create, url: 'https://example.com/hook', events: %w(deploy rollback)
+          post :create, delivery_url: 'https://example.com/hook', events: %w(deploy rollback)
         end
-        assert_json 'url', 'https://example.com/hook'
-        assert_json 'id', Hook.last.id
+        hook = Hook.last
+        assert_json 'delivery_url', 'https://example.com/hook'
+        assert_json 'url', "http://shipit.com/api/hooks/#{hook.id}"
+        assert_json 'id', hook.id
       end
 
       test "#create do not allow to set protected attributes" do
-        post :create, url: 'https://example.com/hook', events: %w(deploy rollback), created_at: 2.months.ago.to_s(:db)
+        post :create, delivery_url: 'https://example.com/hook',
+                      events: %w(deploy rollback),
+                      created_at: 2.months.ago.to_s(:db)
         Hook.last.created_at > 2.seconds.ago
       end
 
       test "#create returns validation errors" do
-        post :create, url: '../etc/passwd', events: %w(deploy)
+        post :create, delivery_url: '../etc/passwd', events: %w(deploy)
         assert_response :unprocessable_entity
-        assert_json 'errors', 'url' => ['is not a valid URL']
+        assert_json 'errors', 'delivery_url' => ['is not a valid URL']
       end
 
       test "#update changes an existing hook" do
         hook = Hook.global.first
-        patch :update, id: hook.id, url: 'https://shipit.com/'
+        patch :update, id: hook.id, delivery_url: 'https://shipit.com/'
         assert_response :ok
-        assert_json 'url', 'https://shipit.com/'
+        assert_json 'delivery_url', 'https://shipit.com/'
       end
 
       test "#destroy removes an existing hook" do

data/test/controllers/stacks_controller_test.rb

@@ -54,11 +54,15 @@ module Shipit
       assert_redirected_to '/github/auth/github?origin=http%3A%2F%2Ftest.host%2F'
     end
 
-    test "current_user must be a member of Shipit.github_team" do
-      Shipit.stubs(:github_team).returns(shipit_teams(:cyclimse_cooks))
+    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 to access this application.', response.body
+      assert_equal(
+        'You must be a member of cyclimse/cooks or shopify/developers to access this application.',
+        response.body,
+      )
     end
 
     test "#show is success" do

data/test/dummy/config/secrets.example.yml

@@ -3,7 +3,9 @@ development:
   github_oauth:
     # id:
     # secret:
-    # team:
+    # teams:
+    #   -
+    #   -
   github_api:
     # access_token:
     # login:
@@ -23,5 +25,7 @@ test:
   github_oauth:
     id: 1d
     secret: s3cr37
-    # team:
+    # teams:
+    #   -
+    #   -
   redis_url: "redis://127.0.0.1:6379/7"

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160104151833) do
+ActiveRecord::Schema.define(version: 20160122165559) do
 
   create_table "api_clients", force: :cascade do |t|
     t.text     "permissions", limit: 65535
@@ -76,7 +76,7 @@ ActiveRecord::Schema.define(version: 20160104151833) do
 
   create_table "hooks", force: :cascade do |t|
     t.integer  "stack_id",     limit: 4
-    t.string   "url",          limit: 4096,                  null: false
+    t.string   "delivery_url", limit: 4096,                  null: false
     t.string   "content_type", limit: 4,    default: "json", null: false
     t.string   "secret",       limit: 255
     t.string   "events",       limit: 255,  default: "",     null: false
@@ -161,8 +161,6 @@ ActiveRecord::Schema.define(version: 20160104151833) do
   add_index "tasks", ["rolled_up", "created_at", "status"], name: "index_tasks_on_rolled_up_and_created_at_and_status"
   add_index "tasks", ["since_commit_id"], name: "index_tasks_on_since_commit_id"
   add_index "tasks", ["stack_id"], name: "index_tasks_on_stack_id"
-  add_index "tasks", ["type", "stack_id", "parent_id"], name: "index_tasks_by_stack_and_parent"
-  add_index "tasks", ["type", "stack_id", "status"], name: "index_tasks_by_stack_and_status"
   add_index "tasks", ["until_commit_id"], name: "index_tasks_on_until_commit_id"
   add_index "tasks", ["user_id"], name: "index_tasks_on_user_id"
 

data/test/fixtures/shipit/hooks.yml

@@ -1,28 +1,28 @@
 shipit_deploys:
   stack: shipit
   events: 'deploy,rollback'
-  url: https://example.com/events/deploy
+  delivery_url: https://example.com/events/deploy
   content_type: json
 
 all_deploys:
   events: 'deploy,rollback'
-  url: https://example.com/events/deploy
+  delivery_url: https://example.com/events/deploy
   content_type: form
 
 shipit_tasks:
   stack: shipit
   events: 'task'
-  url: https://example.com/events/deploy
+  delivery_url: https://example.com/events/deploy
   content_type: json
 
 shipit_commit_status:
   stack: shipit
   events: 'commit_status'
-  url: https://example.com/events/commit_status
+  delivery_url: https://example.com/events/commit_status
   content_type: json
 
 cyclimse_deploy_status:
   stack: cyclimse
   events: 'deploy_status'
-  url: https://example.com/events/deploy_status
+  delivery_url: https://example.com/events/deploy_status
   content_type: json

data/test/helpers/hooks_helper.rb

@@ -0,0 +1,36 @@
+module HooksHelper
+  def expect_hook(event, stack = nil, payload = nil)
+    spy_on_hook
+    yield
+    assert_received_with(Shipit::Hook, :emit) do |call|
+      if call.args.first == event && (stack.nil? || call.args.second == stack)
+        if payload.respond_to?(:call)
+          payload.call(call.args.third)
+        elsif payload
+          payload == call.args.third
+        else
+          true
+        end
+      end
+    end
+  end
+
+  def expect_no_hook(*args)
+    spy_on_hook
+    yield
+    spy = Spy::Subroutine.get(Shipit::Hook, :emit)
+    called = spy.calls.find do |call|
+      args.map.with_index.all? { |value, index| value == call.args[index] }
+    end
+    matcher = args.map(&:inspect).join(', ')
+    got = called && called.args.map(&:inspect).join(', ')
+    refute called, "Expected no hook matching: (#{matcher})\n  got: (#{got})"
+  end
+
+  private
+
+  def spy_on_hook
+    Spy.on(Shipit::Hook, :emit).and_call_through
+  rescue Spy::AlreadyHookedError
+  end
+end

data/test/helpers/payloads_helper.rb

@@ -4,4 +4,3 @@ module PayloadsHelper
     JSON.parse(file.read)
   end
 end
-

data/test/jobs/perform_task_job_test.rb

@@ -29,7 +29,6 @@ module Shipit
       DeployCommands.any_instance.expects(:perform).returns([])
       @job.stubs(:capture)
 
-      Hook.expects(:emit).twice
       assert_enqueued_with(job: FetchDeployedRevisionJob, args: [@deploy.stack]) do
         @job.perform(@deploy)
       end

data/test/models/commits_test.rb

@@ -309,14 +309,14 @@ module Shipit
           assert_equal initial_state, commit.state
 
           expected_status_attributes = {state: new_state, description: initial_state, context: 'ci/travis'}
-          if should_fire
-            expect_hook_emit(commit, :deployable_status, expected_status_attributes)
-          else
-            Hook.expects(:emit).never
+          add_status = -> { commit.add_status(expected_status_attributes.merge(created_at: 1.day.ago.to_s(:db))) }
+          expect_hook_emit(commit, :commit_status, expected_status_attributes) do
+            if should_fire
+              expect_hook_emit(commit, :deployable_status, expected_status_attributes, &add_status)
+            else
+              expect_no_hook(:deployable_status, &add_status)
+            end
           end
-          expect_hook_emit(commit, :commit_status, expected_status_attributes)
-
-          commit.add_status(expected_status_attributes.merge(created_at: 1.day.ago.to_s(:db)))
         end
       end
     end
@@ -324,15 +324,24 @@ module Shipit
     test "#add_status does not fire webhooks for invisible statuses" do
       commit = shipit_commits(:second)
       assert commit.stack.hooks.where(events: ['commit_status']).size >= 1
-      Hook.expects(:emit).never
-      commit.add_status(state: 'failure', description: 'Sad', context: 'ci/hidden', created_at: 1.day.ago.to_s(:db))
+
+      expect_no_hook(:deployable_status) do
+        commit.add_status(state: 'failure', description: 'Sad', context: 'ci/hidden', created_at: 1.day.ago.to_s(:db))
+      end
     end
 
     test "#add_status does not fire webhooks for non-meaningful statuses" do
       commit = shipit_commits(:second)
       assert commit.stack.hooks.where(events: ['commit_status']).size >= 1
-      Hook.expects(:emit).never
-      commit.add_status(state: 'failure', description: 'Sad', context: 'ci/ok_to_fail', created_at: 1.day.ago.to_s(:db))
+
+      expect_no_hook(:deployable_status) do
+        commit.add_status(
+          state: 'failure',
+          description: 'Sad',
+          context: 'ci/ok_to_fail',
+          created_at: 1.day.ago.to_s(:db),
+        )
+      end
     end
 
     test "#visible_statuses forward the last_statuses to the stack" do
@@ -397,11 +406,13 @@ module Shipit
       end
     end
 
-    def expect_hook_emit(commit, event, status_attributes)
-      matchers = status_attributes.to_a.map { |pair| responds_with(pair.first, pair.second) }
-      Hook.expects(:emit).with(event, commit.stack, has_entries(commit: commit, stack: commit.stack,
-                                                                event => all_of(*matchers),
-                                                                status: status_attributes[:state]))
+    def expect_hook_emit(commit, event, status_attributes, &block)
+      matches = lambda do |payload|
+        assert_equal commit, payload[:commit]
+        assert_equal commit.stack, payload[:stack]
+        assert_equal status_attributes[:state], payload[:status]
+      end
+      expect_hook(event, commit.stack, matches, &block)
     end
   end
 end

data/test/models/deploys_test.rb

@@ -96,37 +96,41 @@ module Shipit
     test "transitioning to success causes an event to be broadcasted" do
       deploy = shipit_deploys(:shipit_pending)
 
-      expect_hook(:deploy, deploy.stack, status: 'success', deploy: deploy, stack: deploy.stack)
       expect_event(deploy)
       deploy.status = 'running'
-      deploy.complete!
+      expect_hook(:deploy, deploy.stack, status: 'success', deploy: deploy, stack: deploy.stack) do
+        deploy.complete!
+      end
     end
 
     test "transitioning to failed causes an event to be broadcasted" do
       deploy = shipit_deploys(:shipit_pending)
 
-      expect_hook(:deploy, deploy.stack, status: 'failed', deploy: deploy, stack: deploy.stack)
       expect_event(deploy)
       deploy.status = 'running'
-      deploy.failure!
+      expect_hook(:deploy, deploy.stack, status: 'failed', deploy: deploy, stack: deploy.stack) do
+        deploy.failure!
+      end
     end
 
     test "transitioning to error causes an event to be broadcasted" do
       deploy = shipit_deploys(:shipit_pending)
 
-      expect_hook(:deploy, deploy.stack, status: 'error', deploy: deploy, stack: deploy.stack)
       expect_event(deploy)
       deploy.status = 'running'
-      deploy.error!
+      expect_hook(:deploy, deploy.stack, status: 'error', deploy: deploy, stack: deploy.stack) do
+        deploy.error!
+      end
     end
 
     test "transitioning to running causes an event to be broadcasted" do
       deploy = shipit_deploys(:shipit_pending)
 
-      expect_hook(:deploy, deploy.stack, status: 'running', deploy: deploy, stack: deploy.stack)
       expect_event(deploy)
       deploy.status = 'pending'
-      deploy.run!
+      expect_hook(:deploy, deploy.stack, status: 'running', deploy: deploy, stack: deploy.stack) do
+        deploy.run!
+      end
     end
 
     test "creating a deploy causes an event to be broadcasted" do
@@ -386,9 +390,5 @@ module Shipit
         channel == "stack.#{deploy.stack.id}" && data['url'] == "/#{deploy.stack.to_param}"
       end
     end
-
-    def expect_hook(event, stack, payload)
-      Hook.expects(:emit).with(event, stack, payload)
-    end
   end
 end

data/test/models/hook_test.rb

@@ -8,15 +8,15 @@ module Shipit
     end
 
     test "#url must be valid" do
-      @hook.url = 'file:/ad"fa/adfa'
+      @hook.delivery_url = 'file:/ad"fa/adfa'
       refute @hook.valid?
-      assert_equal ['Url is not a valid URL'], @hook.errors.full_messages
+      assert_equal ['Delivery url is not a valid URL'], @hook.errors.full_messages
     end
 
     test "#url must not be localhost" do
-      @hook.url = 'file:///etc/passwd'
+      @hook.delivery_url = 'file:///etc/passwd'
       refute @hook.valid?
-      assert_equal ['Url is not a valid URL'], @hook.errors.full_messages
+      assert_equal ['Delivery url is not a valid URL'], @hook.errors.full_messages
     end
 
     test "#events is accessible as an array" do
@@ -42,7 +42,7 @@ module Shipit
 
       delivery = Delivery.last
 
-      assert_equal @hook.url, delivery.url
+      assert_equal @hook.delivery_url, delivery.url
       assert_equal 'application/x-www-form-urlencoded', delivery.content_type
       assert_equal 'foo=42', delivery.payload
       assert_equal 'scheduled', delivery.status

data/test/models/stacks_test.rb

@@ -284,14 +284,16 @@ module Shipit
     end
 
     test "locking the stack triggers a webhook" do
-      expect_hook(:lock, @stack, locked: true, stack: @stack)
-      @stack.update(lock_reason: "Just for fun", lock_author: shipit_users(:walrus))
+      expect_hook(:lock, @stack, locked: true, stack: @stack) do
+        @stack.update(lock_reason: "Just for fun", lock_author: shipit_users(:walrus))
+      end
     end
 
     test "unlocking the stack triggers a webhook" do
       @stack.update(lock_reason: "Just for fun", lock_author: shipit_users(:walrus))
-      expect_hook(:lock, @stack, locked: false, stack: @stack)
-      @stack.update(lock_reason: nil)
+      expect_hook(:lock, @stack, locked: false, stack: @stack) do
+        @stack.update(lock_reason: nil)
+      end
     end
 
     test "the git cache lock prevent concurrent access to the git cache" do
@@ -347,10 +349,16 @@ module Shipit
       assert_equal [commit1, commit2], stack.filter_meaningful_statuses([soft_fail, commit1, commit2])
     end
 
-    private
+    test "updating the stack emit a hook" do
+      expect_hook(:stack, @stack, action: :updated, stack: @stack) do
+        @stack.update(repo_name: 'foo')
+      end
+    end
 
-    def expect_hook(event, stack, payload)
-      Hook.expects(:emit).with(event, stack, payload)
+    test "updating the stack doesn't emit a hook if only `updated_at` is changed" do
+      expect_no_hook(:stack) do
+        @stack.update(updated_at: Time.zone.now)
+      end
     end
   end
 end

data/test/test_helper.rb

@@ -6,11 +6,14 @@ SimpleCov.start 'rails'
 require 'fakeweb'
 FakeWeb.allow_net_connect = false
 
-require File.expand_path("../../test/dummy/config/environment.rb", __FILE__)
-ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
-ActiveRecord::Migrator.migrations_paths << File.expand_path('../../db/migrate', __FILE__)
-require "rails/test_help"
-require "mocha/mini_test"
+require File.expand_path('../../test/dummy/config/environment.rb', __FILE__)
+ActiveRecord::Migrator.migrations_paths = [
+  File.expand_path('../../test/dummy/db/migrate', __FILE__),
+  File.expand_path('../../db/migrate', __FILE__),
+]
+require 'rails/test_help'
+require 'mocha/mini_test'
+require 'spy/integration'
 
 # Load fixtures from the engine
 if ActiveSupport::TestCase.respond_to?(:fixture_path=)
@@ -34,6 +37,7 @@ class ActiveSupport::TestCase
   include JSONHelper
   include LinksHelper
   include ApiHelper
+  include HooksHelper
   include ActiveJob::TestHelper
 
   setup do

data/test/unit/shipit_test.rb

@@ -44,5 +44,21 @@ module Shipit
       refute Shipit.github_enterprise?
       assert_equal({}, Shipit.github_oauth_options)
     end
+
+    test ".github_teams returns an empty array if there's no team" do
+      assert_equal([], Shipit.github_teams)
+    end
+
+    test ".github_teams returns the team key as an array" do
+      Rails.application.secrets.stubs(:github_oauth).returns('team' => 'shopify/developers')
+      assert_equal(['shopify/developers'], Shipit.github_teams.map(&:handle))
+    end
+
+    test ".github_teams merges the teams and team keys in a single array" do
+      Rails.application.secrets.stubs(:github_oauth).returns(
+        'team' => 'shopify/developers',
+        'teams' => ['shopify/developers', 'cyclimse/cooks'])
+      assert_equal(['cyclimse/cooks', 'shopify/developers'], Shipit.github_teams.map(&:handle))
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipit-engine
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -531,6 +531,7 @@ files:
 - db/migrate/20151113151323_improve_indexes_on_tasks.rb
 - db/migrate/20160104151742_increase_tasks_type_size_back.rb
 - db/migrate/20160104151833_convert_sti_columns.rb
+- db/migrate/20160122165559_rename_hooks_url_in_delivery_url.rb
 - db/schema.rb
 - lib/shipit-engine.rb
 - lib/shipit.rb
@@ -632,6 +633,7 @@ files:
 - test/fixtures/shipit/users.yml
 - test/helpers/api_helper.rb
 - test/helpers/fixture_aliases_helper.rb
+- test/helpers/hooks_helper.rb
 - test/helpers/json_helper.rb
 - test/helpers/links_helper.rb
 - test/helpers/payloads_helper.rb
@@ -772,6 +774,7 @@ test_files:
 - test/fixtures/shipit/users.yml
 - test/helpers/api_helper.rb
 - test/helpers/fixture_aliases_helper.rb
+- test/helpers/hooks_helper.rb
 - test/helpers/json_helper.rb
 - test/helpers/links_helper.rb
 - test/helpers/payloads_helper.rb