Merge branch 'sidekiq'

Dmitriy Zaporozhets
2 parents 7bfd38ea 9773ccc4
Showing 36 changed files with 147 additions and 196 deletions Show diff stats
Gemfile
Gemfile.lock
Procfile
app/controllers/admin/dashboard_controller.rb
app/mailers/notify.rb
app/models/project.rb
app/models/system_hook.rb
app/observers/issue_observer.rb
app/observers/merge_request_observer.rb
app/observers/note_observer.rb
app/observers/user_observer.rb
app/observers/users_project_observer.rb
app/views/admin/dashboard/index.html.haml
app/views/admin/resque/show.html.haml
app/views/layouts/admin.html.haml
app/workers/post_receive.rb
app/workers/system_hook_worker.rb
config/initializers/4_resque.rb
config/initializers/4_sidekiq.rb
config/routes.rb
@@ -81,8 +81,9 @@ gem &quot;acts-as-taggable-on&quot;, &quot;2.3.3&quot;
 gem "draper", "~> 0.18.0"
 # Background jobs
-gem "resque", git: "https://github.com/gitlabhq/resque.git", ref: "9ef4700306dd946a3ac000612428967ce0c32213"
-gem 'resque_mailer'
+gem 'slim'
+gem 'sinatra', :require => nil
+gem 'sidekiq', '2.6.4'
 # HTTP requests
 gem "httparty"
@@ -157,7 +158,6 @@ group :test do
   gem "simplecov", require: false
   gem "shoulda-matchers", "1.3.0"
   gem 'email_spec'
-  gem 'resque_spec'
   gem "webmock"
   gem 'test_after_commit'
 end
@@ -55,17 +55,6 @@ GIT
     raphael-rails (2.1.0)
 GIT
-  remote: https://github.com/gitlabhq/resque.git
-  revision: 9ef4700306dd946a3ac000612428967ce0c32213
-  ref: 9ef4700306dd946a3ac000612428967ce0c32213
-  specs:
-    resque (2.0.0.pre.1)
-      json
-      redis-namespace (~> 1.0)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-
-GIT
   remote: https://github.com/jonleighton/poltergeist.git
   revision: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
   ref: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
@@ -132,6 +121,9 @@ GEM
     carrierwave (0.7.1)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
+    celluloid (0.12.4)
+      facter (>= 1.6.12)
+      timers (>= 1.0.0)
     charlock_holmes (0.6.9)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
@@ -150,6 +142,7 @@ GEM
     coffee-script-source (1.4.0)
     colored (1.2)
     colorize (0.5.8)
+    connection_pool (1.0.0)
     crack (0.3.1)
     daemons (1.1.9)
     devise (2.1.2)
@@ -169,6 +162,7 @@ GEM
     eventmachine (1.0.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
+    facter (1.6.17)
     factory_girl (4.1.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.1.0)
@@ -370,11 +364,6 @@ GEM
     redis (3.0.2)
     redis-namespace (1.2.1)
       redis (~> 3.0.0)
-    resque_mailer (2.1.0)
-      actionmailer (~> 3.0)
-    resque_spec (0.12.5)
-      resque (>= 1.19.0)
-      rspec (>= 2.5.0)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -412,6 +401,12 @@ GEM
     sexp_processor (4.1.3)
     shoulda-matchers (1.3.0)
       activesupport (>= 3.0.0)
+    sidekiq (2.6.4)
+      celluloid (~> 0.12.0)
+      connection_pool (~> 1.0)
+      multi_json (~> 1)
+      redis (~> 3)
+      redis-namespace
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -421,6 +416,9 @@ GEM
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     six (0.2.0)
+    slim (1.3.6)
+      temple (~> 0.5.5)
+      tilt (~> 1.3.3)
     slop (3.3.3)
     spinach (0.5.2)
       colorize
@@ -435,6 +433,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     stamp (0.3.0)
+    temple (0.5.5)
     test_after_commit (0.0.1)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
@@ -444,6 +443,7 @@ GEM
       rack (>= 1.0.0)
     thor (0.16.0)
     tilt (1.3.3)
+    timers (1.0.2)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -455,8 +455,6 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
     virtus (0.5.2)
       backports (~> 2.6.1)
     warden (1.2.1)
@@ -534,17 +532,17 @@ DEPENDENCIES
   rb-fsevent
   rb-inotify
   redcarpet (~> 2.2.2)
-  resque!
-  resque_mailer
-  resque_spec
   rspec-rails
   sass-rails (~> 3.2.5)
   sdoc
   seed-fu
   settingslogic
   shoulda-matchers (= 1.3.0)
+  sidekiq (= 2.6.4)
   simplecov
+  sinatra
   six
+  slim
   spinach-rails
   stamp
   test_after_commit
 web: bundle exec rails s -p $PORT
-worker: bundle exec rake environment resque:work QUEUE=* VVERBOSE=1
+worker: bundle exec sidekiq -q post_receive,mailer,system_hook,common,default
@@ -3,10 +3,6 @@ class Admin::DashboardController &lt; AdminController
     @projects = Project.order("created_at DESC").limit(10)
     @users = User.order("created_at DESC").limit(10)
-    @resque_accessible = true
-    @workers = Resque.workers
-    @pending_jobs = Resque.size(:post_receive)
-
   rescue Redis::InheritedError
     @resque_accessible = false
   end
 class Notify < ActionMailer::Base
-  include Resque::Mailer
+
   add_template_helper ApplicationHelper
   add_template_helper GitlabMarkdownHelper
@@ -251,7 +251,7 @@ class Project &lt; ActiveRecord::Base
   def send_move_instructions
     self.users_projects.each do |member|
-      Notify.project_was_moved_email(member.id).deliver
+      Notify.delay.project_was_moved_email(member.id)
     end
   end
@@ -19,6 +19,6 @@ class SystemHook &lt; WebHook
   end
   def async_execute(data)
-    Resque.enqueue(SystemHookWorker, id, data)
+    Sidekiq::Client.enqueue(SystemHookWorker, id, data)
   end
 end
@@ -3,7 +3,7 @@ class IssueObserver &lt; ActiveRecord::Observer
   def after_create(issue)
     if issue.assignee && issue.assignee != current_user
-      Notify.new_issue_email(issue.id).deliver
+      Notify.delay.new_issue_email(issue.id)
     end
   end
@@ -16,7 +16,7 @@ class IssueObserver &lt; ActiveRecord::Observer
     if status
       Note.create_status_change_note(issue, current_user, status)
       [issue.author, issue.assignee].compact.each do |recipient|
-        Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user.id).deliver
+        Notify.delay.issue_status_changed_email(recipient.id, issue.id, status, current_user.id)
       end
     end
   end
@@ -27,7 +27,7 @@ class IssueObserver &lt; ActiveRecord::Observer
     recipient_ids = [issue.assignee_id, issue.assignee_id_was].keep_if {|id| id && id != current_user.id }
     recipient_ids.each do |recipient_id|
-      Notify.reassigned_issue_email(recipient_id, issue.id, issue.assignee_id_was).deliver
+      Notify.delay.reassigned_issue_email(recipient_id, issue.id, issue.assignee_id_was)
     end
   end
 end
@@ -3,7 +3,7 @@ class MergeRequestObserver &lt; ActiveRecord::Observer
   def after_create(merge_request)
     if merge_request.assignee && merge_request.assignee != current_user
-      Notify.new_merge_request_email(merge_request.id).deliver
+      Notify.delay.new_merge_request_email(merge_request.id)
     end
   end
@@ -25,7 +25,7 @@ class MergeRequestObserver &lt; ActiveRecord::Observer
     recipients_ids.delete current_user.id
     recipients_ids.each do |recipient_id|
-      Notify.reassigned_merge_request_email(recipient_id, merge_request.id, merge_request.assignee_id_was).deliver
+      Notify.delay.reassigned_merge_request_email(recipient_id, merge_request.id, merge_request.assignee_id_was)
     end
   end
 end
@@ -11,7 +11,7 @@ class NoteObserver &lt; ActiveRecord::Observer
       notify_team(note)
     elsif note.notify_author
       # Notify only author of resource
-      Notify.note_commit_email(note.commit_author.id, note.id).deliver
+      Notify.delay.note_commit_email(note.commit_author.id, note.id)
     else
       # Otherwise ignore it
       nil
@@ -26,7 +26,7 @@ class NoteObserver &lt; ActiveRecord::Observer
     if Notify.respond_to? notify_method
       team_without_note_author(note).map do |u|
-        Notify.send(notify_method, u.id, note.id).deliver
+        Notify.delay.send(notify_method, u.id, note.id)
       end
     end
   end
@@ -2,7 +2,7 @@ class UserObserver &lt; ActiveRecord::Observer
   def after_create(user)
     log_info("User \"#{user.name}\" (#{user.email}) was created")
-    Notify.new_user_email(user.id, user.password).deliver
+    Notify.delay.new_user_email(user.id, user.password)
   end
   def after_destroy user
 class UsersProjectObserver < ActiveRecord::Observer
   def after_commit(users_project)
     return if users_project.destroyed?
-    Notify.project_access_granted_email(users_project.id).deliver
+    Notify.delay.project_access_granted_email(users_project.id)
   end
   def after_create(users_project)
 .admin_dash.row
-  .span3
+  .span4
     .ui-box
       %h5.title Projects
       .data.padded
@@ -7,7 +7,7 @@
           %h1= Project.count
         %hr
         = link_to 'New Project', new_project_path, class: "btn small"
-  .span3
+  .span4
     .ui-box
       %h5.title Groups
       .data.padded
@@ -15,7 +15,7 @@
           %h1= Group.count
         %hr
         = link_to 'New Group', new_admin_group_path, class: "btn small"
-  .span3
+  .span4
     .ui-box
       %h5.title Users
       .data.padded
@@ -23,25 +23,6 @@
           %h1= User.count
         %hr
         = link_to 'New User', new_admin_user_path, class: "btn small"
-  .span3
-    .ui-box
-      %h5.title
-        Resque Workers
-      .data.padded
-        - if @resque_accessible
-          = link_to admin_resque_path do
-            %h1{class: @workers.present? ? "cgreen" : "cred"}
-              = @workers.count
-          %hr
-          %p
-            %strong{class: @pending_jobs > 0 ? "cred" : "cgreen"}
-              #{@pending_jobs} post receive jobs waiting
-        - else
-          = link_to admin_resque_path do
-            %h1.cdark ?
-          %hr
-          %p
-            %strong Resque status unknown
 .row
   .span6
-%h3.page_title Resque
+%h3.page_title Background Jobs
 %br
 .ui-box
-  %iframe{src: resque_path, width: '100%', height: 600, style: "border: none"}
+  %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}
@@ -19,6 +19,6 @@
         = nav_link(controller: :hooks) do
           = link_to "Hooks", admin_hooks_path
         = nav_link(controller: :resque) do
-          = link_to "Resque", admin_resque_path
+          = link_to "Background Jobs", admin_resque_path
       .content= yield
 class PostReceive
-  @queue = :post_receive
+  include Sidekiq::Worker
-  def self.perform(repo_path, oldrev, newrev, ref, identifier)
+  sidekiq_options queue: :post_receive
+
+  def perform(repo_path, oldrev, newrev, ref, identifier)
     repo_path.gsub!(Gitlab.config.gitolite.repos_path.to_s, "")
     repo_path.gsub!(/.git$/, "")
     repo_path.gsub!(/^\//, "")
 class SystemHookWorker
-  @queue = :system_hook
+  include Sidekiq::Worker
-  def self.perform(hook_id, data)
+  sidekiq_options queue: :system_hook
+
+  def perform(hook_id, data)
     SystemHook.find(hook_id).execute data
   end
 end
@@ -1,29 +0,0 @@
-# Custom Redis configuration
-config_file = Rails.root.join('config', 'resque.yml')
-
-if File.exists?(config_file)
-  resque_config = YAML.load_file(config_file)
-  Resque.redis = resque_config[Rails.env]
-end
-Resque.redis.namespace = 'resque:gitlab'
-Resque.before_fork = Proc.new { ActiveRecord::Base.establish_connection }
-
-# Authentication
-require 'resque/server'
-class ResqueAuthentication
-  def initialize(app)
-    @app = app
-  end
-
-  def call(env)
-    account = env['warden'].authenticate!(:database_authenticatable, :rememberable, scope: :user)
-    raise "Access denied" if !account.admin?
-    @app.call(env)
-  end
-end
-
-Resque::Server.use ResqueAuthentication
-
-# Mailer
-Resque::Mailer.excluded_environments = []
-
@@ -0,0 +1,22 @@
+# Custom Redis configuration
+config_file = Rails.root.join('config', 'resque.yml')
+
+resque_url = if File.exists?(config_file)
+               YAML.load_file(config_file)[Rails.env]
+             else
+               "localhost:6379"
+             end
+
+Sidekiq.configure_server do |config|
+  config.redis = {
+    url: "redis://#{resque_url}",
+    namespace: 'resque:gitlab'
+  }
+end
+
+Sidekiq.configure_client do |config|
+  config.redis = {
+    url: "redis://#{resque_url}",
+    namespace: 'resque:gitlab'
+  }
+end
+require 'sidekiq/web'
+
 Gitlab::Application.routes.draw do
   #
   # Search
@@ -8,9 +10,10 @@ Gitlab::Application.routes.draw do
   require 'api'
   mount Gitlab::API => '/api'
-  # Optionally, enable Resque here
-  require 'resque/server'
-  mount Resque::Server => '/info/resque', as: 'resque'
+  constraint = lambda { |request| request.env["warden"].authenticate? and request.env['warden'].user.admin? }
+  constraints constraint do
+    mount Sidekiq::Web, at: "/admin/sidekiq", as: :sidekiq
+  end
   # Enable Grack support
   mount Grack::Bundle.new({
@@ -28,6 +28,6 @@ class AdminActiveTab &lt; Spinach::FeatureSteps
   end
   Then 'the active main tab should be Resque' do
-    ensure_active_main_tab('Resque')
+    ensure_active_main_tab('Background Jobs')
   end
 end
@@ -6,6 +6,8 @@ require &#39;./config/environment&#39;
 require 'rspec'
 require 'database_cleaner'
 require 'spinach/capybara'
+require 'sidekiq/testing/inline'
+
 %w(gitolite_stub stubbed_repository valid_commit).each do |f|
   require Rails.root.join('spec', 'support', f)
 #!/usr/bin/env bash
+# Version 4.1
 # This file was placed here by GitLab. It makes sure that your pushed commits
 # will be processed properly.
@@ -871,7 +871,7 @@ namespace :gitlab do
   namespace :resque do
-    desc "GITLAB | Check the configuration of Resque"
+    desc "GITLAB | Check the configuration of Sidekiq"
     task check: :environment  do
       warn_user_is_not_gitlab
       start_checking "Resque"
@@ -888,7 +888,7 @@ namespace :gitlab do
     def check_resque_running
       print "Running? ... "
-      if run_and_match("ps aux | grep -i resque", /resque-[\d\.]+:.+$/)
+      if run_and_match("ps aux | grep -i sidekiq", /sidekiq-[\d\.]+:.+$/)
         puts "yes".green
       else
         puts "no".red
@@ -899,7 +899,7 @@ namespace :gitlab do
         )
         for_more_information(
           see_installation_guide_section("Install Init Script"),
-          "see log/resque.log for possible errors"
+          "see log/sidekiq.log for possible errors"
         )
         fix_and_rerun
       end
@@ -1,23 +0,0 @@
-require 'resque/tasks'
-
-namespace :resque do
-  task setup: :environment do
-    Resque.before_fork = Proc.new { ActiveRecord::Base.establish_connection }
-  end
-
-  desc "Resque | kill all workers (using -QUIT), god will take care of them"
-  task :stop_workers => :environment do
-    pids = Array.new
-
-    Resque.workers.each do |worker|
-      pids << worker.to_s.split(/:/).second
-    end
-
-    if pids.size > 0
-      system("kill -QUIT #{pids.join(' ')}")
-    end
-  end
-end
-
-desc "Alias for resque:work (To run workers on Heroku)"
-task "jobs:work" => "resque:work"
@@ -0,0 +1,23 @@
+namespace :sidekiq do
+  desc "GITLAB | Stop sidekiq"
+  task :stop do
+    run "bundle exec sidekiqctl stop #{pidfile}"
+  end
+
+  desc "GITLAB | Start sidekiq"
+  task :start do
+    run "nohup bundle exec sidekiq -q post_receive,mailer,system_hook,common,default -e #{rails_env} -P #{pidfile} >> #{root_path}/log/sidekiq.log 2>&1 &"
+  end
+
+  def root_path
+    @root_path ||= File.join(File.expand_path(File.dirname(__FILE__)), "../..")
+  end
+
+  def pidfile
+    "#{root_path}/tmp/pids/sidekiq.pid"
+  end
+
+  def rails_env
+    ENV['RAILS_ENV'] || "production"
+  end
+end
@@ -1,2 +0,0 @@
-mkdir -p tmp/pids
-nohup bundle exec rake environment resque:work QUEUE=post_receive,mailer,system_hook RAILS_ENV=production PIDFILE=tmp/pids/resque_worker.pid > ./log/resque.stdout.log 2>./log/resque.stderr.log  &
 \ No newline at end of file
@@ -1,2 +0,0 @@
-mkdir -p tmp/pids
-nohup bundle exec rake environment resque:work QUEUE=post_receive,mailer,system_hook VVERBOSE=1 RAILS_ENV=development PIDFILE=tmp/pids/resque_worker.pid > ./log/resque.log  &
@@ -23,41 +23,31 @@ describe SystemHook do
     end
     it "project_create hook" do
-      with_resque do
-        project = create(:project)
-      end
+      project = create(:project)
       WebMock.should have_requested(:post, @system_hook.url).with(body: /project_create/).once
     end
     it "project_destroy hook" do
       project = create(:project)
-      with_resque do
-        project.destroy
-      end
+      project.destroy
       WebMock.should have_requested(:post, @system_hook.url).with(body: /project_destroy/).once
     end
     it "user_create hook" do
-      with_resque do
-        create(:user)
-      end
+      create(:user)
       WebMock.should have_requested(:post, @system_hook.url).with(body: /user_create/).once
     end
     it "user_destroy hook" do
       user = create(:user)
-      with_resque do
-        user.destroy
-      end
+      user.destroy
       WebMock.should have_requested(:post, @system_hook.url).with(body: /user_destroy/).once
     end
     it "project_create hook" do
       user = create(:user)
       project = create(:project)
-      with_resque do
-        project.team << [user, :master]
-      end
+      project.team << [user, :master]
       WebMock.should have_requested(:post, @system_hook.url).with(body: /user_add_to_team/).once
     end
@@ -65,11 +55,8 @@ describe SystemHook do
       user = create(:user)
       project = create(:project)
       project.team << [user, :master]
-      with_resque do
-        project.users_projects.clear
-      end
+      project.users_projects.clear
       WebMock.should have_requested(:post, @system_hook.url).with(body: /user_remove_from_team/).once
     end
   end
-
 end
@@ -21,8 +21,7 @@ describe IssueObserver do
     end
     it 'sends an email to the assignee' do
-      Notify.should_receive(:new_issue_email).with(issue.id).
-        and_return(double(deliver: true))
+      Notify.should_receive(:new_issue_email).with(issue.id)
       subject.after_create(issue)
     end
@@ -71,6 +70,7 @@ describe IssueObserver do
     context 'a status "closed"' do
       it 'note is created if the issue is being closed' do
         issue.should_receive(:is_being_closed?).and_return(true)
+        Notify.should_receive(:issue_status_changed_email).twice
         Note.should_receive(:create_status_change_note).with(issue, some_user, 'closed')
         subject.after_update(issue)
@@ -85,7 +85,7 @@ describe IssueObserver do
       it 'notification is delivered if the issue being closed' do
         issue.stub(:is_being_closed?).and_return(true)
-        Notify.should_receive(:issue_status_changed_email).twice.and_return(stub(deliver: true))
+        Notify.should_receive(:issue_status_changed_email).twice
         Note.should_receive(:create_status_change_note).with(issue, some_user, 'closed')
         subject.after_update(issue)
@@ -104,7 +104,7 @@ describe IssueObserver do
         issue_without_assignee.stub(:is_being_reassigned?).and_return(false)
         issue_without_assignee.stub(:is_being_closed?).and_return(true)
         issue_without_assignee.stub(:is_being_reopened?).and_return(false)
-        Notify.should_receive(:issue_status_changed_email).once.and_return(stub(deliver: true))
+        Notify.should_receive(:issue_status_changed_email).once
         Note.should_receive(:create_status_change_note).with(issue_without_assignee, some_user, 'closed')
         subject.after_update(issue_without_assignee)
@@ -113,6 +113,7 @@ describe IssueObserver do
     context 'a status "reopened"' do
       it 'note is created if the issue is being reopened' do
+        Notify.should_receive(:issue_status_changed_email).twice
         issue.should_receive(:is_being_reopened?).and_return(true)
         Note.should_receive(:create_status_change_note).with(issue, some_user, 'reopened')
@@ -128,7 +129,7 @@ describe IssueObserver do
       it 'notification is delivered if the issue being reopened' do
         issue.stub(:is_being_reopened?).and_return(true)
-        Notify.should_receive(:issue_status_changed_email).twice.and_return(stub(deliver: true))
+        Notify.should_receive(:issue_status_changed_email).twice
         Note.should_receive(:create_status_change_note).with(issue, some_user, 'reopened')
         subject.after_update(issue)
@@ -147,7 +148,7 @@ describe IssueObserver do
         issue_without_assignee.stub(:is_being_reassigned?).and_return(false)
         issue_without_assignee.stub(:is_being_closed?).and_return(false)
         issue_without_assignee.stub(:is_being_reopened?).and_return(true)
-        Notify.should_receive(:issue_status_changed_email).once.and_return(stub(deliver: true))
+        Notify.should_receive(:issue_status_changed_email).once
         Note.should_receive(:create_status_change_note).with(issue_without_assignee, some_user, 'reopened')
         subject.after_update(issue_without_assignee)
@@ -164,8 +165,7 @@ describe IssueObserver do
     end
     def it_sends_a_reassigned_email_to(recipient)
-      Notify.should_receive(:reassigned_issue_email).with(recipient, issue.id, previous_assignee.id).
-        and_return(double(deliver: true))
+      Notify.should_receive(:reassigned_issue_email).with(recipient, issue.id, previous_assignee.id)
     end
     def it_does_not_send_a_reassigned_email_to(recipient)
@@ -21,9 +21,7 @@ describe MergeRequestObserver do
     end
     it 'sends an email to the assignee' do
-      Notify.should_receive(:new_merge_request_email).with(mr.id).
-        and_return(double(deliver: true))
-
+      Notify.should_receive(:new_merge_request_email).with(mr.id)
       subject.after_create(mr)
     end
@@ -158,8 +156,7 @@ describe MergeRequestObserver do
     end
     def it_sends_a_reassigned_email_to(recipient)
-      Notify.should_receive(:reassigned_merge_request_email).with(recipient, mr.id, previous_assignee.id).
-        and_return(double(deliver: true))
+      Notify.should_receive(:reassigned_merge_request_email).with(recipient, mr.id, previous_assignee.id)
     end
     def it_does_not_send_a_reassigned_email_to(recipient)
@@ -4,7 +4,6 @@ describe NoteObserver do
   subject { NoteObserver.instance }
   let(:team_without_author) { (1..2).map { |n| double :user, id: n } }
-  let(:delivery_success) { double deliver: true }
   describe '#after_create' do
     let(:note) { double :note }
@@ -45,13 +44,13 @@ describe NoteObserver do
       note.stub(:id).and_return(42)
       author = double :user, id: 1
       note.stub(:commit_author).and_return(author)
-      Notify.should_receive(:note_commit_email).and_return(delivery_success)
+      Notify.should_receive(:note_commit_email)
       subject.after_create(note)
     end
     it 'does not notify the author of a commit when not flagged to notify the author' do
-      Notify.should_not_receive(:note_commit_email)
+      notify.should_not_receive(:note_commit_email)
       subject.after_create(note)
     end
@@ -71,28 +70,28 @@ describe NoteObserver do
     context 'notifies team of a new note on' do
       it 'a commit' do
         note.stub(:noteable_type).and_return('Commit')
-        Notify.should_receive(:note_commit_email).twice.and_return(delivery_success)
+        notify.should_receive(:note_commit_email).twice
         subject.send(:notify_team, note)
       end
       it 'an issue' do
         note.stub(:noteable_type).and_return('Issue')
-        Notify.should_receive(:note_issue_email).twice.and_return(delivery_success)
+        notify.should_receive(:note_issue_email).twice
         subject.send(:notify_team, note)
       end
       it 'a wiki page' do
         note.stub(:noteable_type).and_return('Wiki')
-        Notify.should_receive(:note_wiki_email).twice.and_return(delivery_success)
+        notify.should_receive(:note_wiki_email).twice
         subject.send(:notify_team, note)
       end
       it 'a merge request' do
         note.stub(:noteable_type).and_return('MergeRequest')
-        Notify.should_receive(:note_merge_request_email).twice.and_return(delivery_success)
+        notify.should_receive(:note_merge_request_email).twice
         subject.send(:notify_team, note)
       end
@@ -100,16 +99,16 @@ describe NoteObserver do
       it 'a wall' do
         # Note: wall posts have #noteable_type of nil
         note.stub(:noteable_type).and_return(nil)
-        Notify.should_receive(:note_wall_email).twice.and_return(delivery_success)
+        notify.should_receive(:note_wall_email).twice
         subject.send(:notify_team, note)
       end
     end
     it 'does nothing for a new note on a snippet' do
-        note.stub(:noteable_type).and_return('Snippet')
+      note.stub(:noteable_type).and_return('Snippet')
-        subject.send(:notify_team, note).should be_nil
+      subject.send(:notify_team, note).should be_nil
     end
   end
@@ -125,4 +124,8 @@ describe NoteObserver do
       subject.send(:team_without_note_author, note).should == team_without_author
     end
   end
+
+  def notify
+    Notify
+  end
 end
@@ -10,24 +10,14 @@ describe UserObserver do
   end
   context 'when a new user is created' do
-    let(:user) { double(:user, id: 42,
-                        password: 'P@ssword!',
-                        name: 'John',
-                        email: 'u@mail.local',
-                        username: 'root',
-                        create_namespace: true) }
-    let(:notification) { double :notification }
-
     it 'sends an email' do
-      notification.should_receive(:deliver)
-      Notify.should_receive(:new_user_email).with(user.id, user.password).and_return(notification)
-
-      subject.after_create(user)
+      Notify.should_receive(:new_user_email)
+      create(:user)
     end
     it 'trigger logger' do
       Gitlab::AppLogger.should_receive(:info)
-      subject.after_create(user)
+      create(:user)
     end
   end
 end
@@ -41,7 +41,7 @@ describe &quot;Admin::Users&quot; do
     end
     it "should call send mail" do
-      Notify.should_receive(:new_user_email).and_return(stub(deliver: true))
+      Notify.should_receive(:new_user_email)
       User.observers.enable :user_observer do
         click_button "Save"
@@ -50,9 +50,7 @@ describe &quot;Admin::Users&quot; do
     it "should send valid email to user with email & password" do
       User.observers.enable :user_observer do
-        with_resque do
-          click_button "Save"
-        end
+        click_button "Save"
         user = User.last
         email = ActionMailer::Base.deliveries.last
         email.subject.should have_content("Account was created")
 require 'simplecov' unless ENV['CI']
+
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
@@ -8,6 +9,7 @@ require &#39;capybara/rails&#39;
 require 'capybara/rspec'
 require 'webmock/rspec'
 require 'email_spec'
+require 'sidekiq/testing/inline'
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -4,7 +4,7 @@ describe PostReceive do
   context "as a resque worker" do
     it "reponds to #perform" do
-      PostReceive.should respond_to(:perform)
+      PostReceive.new.should respond_to(:perform)
     end
   end
@@ -15,7 +15,7 @@ describe PostReceive do
     it "fetches the correct project" do
       Project.should_receive(:find_with_namespace).with(project.path_with_namespace).and_return(project)
-      PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id)
+      PostReceive.new.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id)
     end
     it "does not run if the author is not in the project" do
@@ -24,7 +24,7 @@ describe PostReceive do
       project.should_not_receive(:observe_push)
       project.should_not_receive(:execute_hooks)
-      PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id).should be_false
+      PostReceive.new.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id).should be_false
     end
     it "asks the project to trigger all hooks" do
@@ -34,7 +34,7 @@ describe PostReceive do
       project.should_receive(:update_merge_requests)
       project.should_receive(:observe_push)
-      PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id)
+      PostReceive.new.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id)
     end
   end
	@@ -55,17 +55,6 @@ GIT		@@ -55,17 +55,6 @@ GIT
55	raphael-rails (2.1.0)	55	raphael-rails (2.1.0)
56		56
57	GIT	57	GIT
58	- remote: https://github.com/gitlabhq/resque.git
59	- revision: 9ef4700306dd946a3ac000612428967ce0c32213
60	- ref: 9ef4700306dd946a3ac000612428967ce0c32213
61	- specs:
62	- resque (2.0.0.pre.1)
63	- json
64	- redis-namespace (~> 1.0)
65	- sinatra (>= 0.9.2)
66	- vegas (~> 0.1.2)
67	-
68	-GIT
69	remote: https://github.com/jonleighton/poltergeist.git	58	remote: https://github.com/jonleighton/poltergeist.git
70	revision: 5c2e092001074a8cf09f332d3714e9ba150bc8ca	59	revision: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
71	ref: 5c2e092001074a8cf09f332d3714e9ba150bc8ca	60	ref: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
	@@ -132,6 +121,9 @@ GEM		@@ -132,6 +121,9 @@ GEM
132	carrierwave (0.7.1)	121	carrierwave (0.7.1)
133	activemodel (>= 3.2.0)	122	activemodel (>= 3.2.0)
134	activesupport (>= 3.2.0)	123	activesupport (>= 3.2.0)
		124	+ celluloid (0.12.4)
		125	+ facter (>= 1.6.12)
		126	+ timers (>= 1.0.0)
135	charlock_holmes (0.6.9)	127	charlock_holmes (0.6.9)
136	childprocess (0.3.6)	128	childprocess (0.3.6)
137	ffi (~> 1.0, >= 1.0.6)	129	ffi (~> 1.0, >= 1.0.6)
	@@ -150,6 +142,7 @@ GEM		@@ -150,6 +142,7 @@ GEM
150	coffee-script-source (1.4.0)	142	coffee-script-source (1.4.0)
151	colored (1.2)	143	colored (1.2)
152	colorize (0.5.8)	144	colorize (0.5.8)
		145	+ connection_pool (1.0.0)
153	crack (0.3.1)	146	crack (0.3.1)
154	daemons (1.1.9)	147	daemons (1.1.9)
155	devise (2.1.2)	148	devise (2.1.2)
	@@ -169,6 +162,7 @@ GEM		@@ -169,6 +162,7 @@ GEM
169	eventmachine (1.0.0)	162	eventmachine (1.0.0)
170	execjs (1.4.0)	163	execjs (1.4.0)
171	multi_json (~> 1.0)	164	multi_json (~> 1.0)
		165	+ facter (1.6.17)
172	factory_girl (4.1.0)	166	factory_girl (4.1.0)
173	activesupport (>= 3.0.0)	167	activesupport (>= 3.0.0)
174	factory_girl_rails (4.1.0)	168	factory_girl_rails (4.1.0)
	@@ -370,11 +364,6 @@ GEM		@@ -370,11 +364,6 @@ GEM
370	redis (3.0.2)	364	redis (3.0.2)
371	redis-namespace (1.2.1)	365	redis-namespace (1.2.1)
372	redis (~> 3.0.0)	366	redis (~> 3.0.0)
373	- resque_mailer (2.1.0)
374	- actionmailer (~> 3.0)
375	- resque_spec (0.12.5)
376	- resque (>= 1.19.0)
377	- rspec (>= 2.5.0)
378	rspec (2.12.0)	367	rspec (2.12.0)
379	rspec-core (~> 2.12.0)	368	rspec-core (~> 2.12.0)
380	rspec-expectations (~> 2.12.0)	369	rspec-expectations (~> 2.12.0)
	@@ -412,6 +401,12 @@ GEM		@@ -412,6 +401,12 @@ GEM
412	sexp_processor (4.1.3)	401	sexp_processor (4.1.3)
413	shoulda-matchers (1.3.0)	402	shoulda-matchers (1.3.0)
414	activesupport (>= 3.0.0)	403	activesupport (>= 3.0.0)
		404	+ sidekiq (2.6.4)
		405	+ celluloid (~> 0.12.0)
		406	+ connection_pool (~> 1.0)
		407	+ multi_json (~> 1)
		408	+ redis (~> 3)
		409	+ redis-namespace
415	simplecov (0.7.1)	410	simplecov (0.7.1)
416	multi_json (~> 1.0)	411	multi_json (~> 1.0)
417	simplecov-html (~> 0.7.1)	412	simplecov-html (~> 0.7.1)
	@@ -421,6 +416,9 @@ GEM		@@ -421,6 +416,9 @@ GEM
421	rack-protection (~> 1.2)	416	rack-protection (~> 1.2)
422	tilt (~> 1.3, >= 1.3.3)	417	tilt (~> 1.3, >= 1.3.3)
423	six (0.2.0)	418	six (0.2.0)
		419	+ slim (1.3.6)
		420	+ temple (~> 0.5.5)
		421	+ tilt (~> 1.3.3)
424	slop (3.3.3)	422	slop (3.3.3)
425	spinach (0.5.2)	423	spinach (0.5.2)
426	colorize	424	colorize
	@@ -435,6 +433,7 @@ GEM		@@ -435,6 +433,7 @@ GEM
435	rack (~> 1.0)	433	rack (~> 1.0)
436	tilt (~> 1.1, != 1.3.0)	434	tilt (~> 1.1, != 1.3.0)
437	stamp (0.3.0)	435	stamp (0.3.0)
		436	+ temple (0.5.5)
438	test_after_commit (0.0.1)	437	test_after_commit (0.0.1)
439	therubyracer (0.10.2)	438	therubyracer (0.10.2)
440	libv8 (~> 3.3.10)	439	libv8 (~> 3.3.10)
	@@ -444,6 +443,7 @@ GEM		@@ -444,6 +443,7 @@ GEM
444	rack (>= 1.0.0)	443	rack (>= 1.0.0)
445	thor (0.16.0)	444	thor (0.16.0)
446	tilt (1.3.3)	445	tilt (1.3.3)
		446	+ timers (1.0.2)
447	treetop (1.4.12)	447	treetop (1.4.12)
448	polyglot	448	polyglot
449	polyglot (>= 0.3.1)	449	polyglot (>= 0.3.1)
	@@ -455,8 +455,6 @@ GEM		@@ -455,8 +455,6 @@ GEM
455	kgio (~> 2.6)	455	kgio (~> 2.6)
456	rack	456	rack
457	raindrops (~> 0.7)	457	raindrops (~> 0.7)
458	- vegas (0.1.11)
459	- rack (>= 1.0.0)
460	virtus (0.5.2)	458	virtus (0.5.2)
461	backports (~> 2.6.1)	459	backports (~> 2.6.1)
462	warden (1.2.1)	460	warden (1.2.1)
	@@ -534,17 +532,17 @@ DEPENDENCIES		@@ -534,17 +532,17 @@ DEPENDENCIES
534	rb-fsevent	532	rb-fsevent
535	rb-inotify	533	rb-inotify
536	redcarpet (~> 2.2.2)	534	redcarpet (~> 2.2.2)
537	- resque!
538	- resque_mailer
539	- resque_spec
540	rspec-rails	535	rspec-rails
541	sass-rails (~> 3.2.5)	536	sass-rails (~> 3.2.5)
542	sdoc	537	sdoc
543	seed-fu	538	seed-fu
544	settingslogic	539	settingslogic
545	shoulda-matchers (= 1.3.0)	540	shoulda-matchers (= 1.3.0)
		541	+ sidekiq (= 2.6.4)
546	simplecov	542	simplecov
		543	+ sinatra
547	six	544	six
		545	+ slim
548	spinach-rails	546	spinach-rails
549	stamp	547	stamp
550	test_after_commit	548	test_after_commit
1	web: bundle exec rails s -p $PORT	1	web: bundle exec rails s -p $PORT
2	-worker: bundle exec rake environment resque:work QUEUE=* VVERBOSE=1	2	+worker: bundle exec sidekiq -q post_receive,mailer,system_hook,common,default
1	class Notify < ActionMailer::Base	1	class Notify < ActionMailer::Base
2	- include Resque::Mailer	2	+
3	add_template_helper ApplicationHelper	3	add_template_helper ApplicationHelper
4	add_template_helper GitlabMarkdownHelper	4	add_template_helper GitlabMarkdownHelper
5		5
	@@ -251,7 +251,7 @@ class Project < ActiveRecord::Base		@@ -251,7 +251,7 @@ class Project < ActiveRecord::Base
251		251
252	def send_move_instructions	252	def send_move_instructions
253	self.users_projects.each do \|member\|	253	self.users_projects.each do \|member\|
254	- Notify.project_was_moved_email(member.id).deliver	254	+ Notify.delay.project_was_moved_email(member.id)
255	end	255	end
256	end	256	end
257		257
	@@ -19,6 +19,6 @@ class SystemHook < WebHook		@@ -19,6 +19,6 @@ class SystemHook < WebHook
19	end	19	end
20		20
21	def async_execute(data)	21	def async_execute(data)
22	- Resque.enqueue(SystemHookWorker, id, data)	22	+ Sidekiq::Client.enqueue(SystemHookWorker, id, data)
23	end	23	end
24	end	24	end
	@@ -3,7 +3,7 @@ class IssueObserver < ActiveRecord::Observer		@@ -3,7 +3,7 @@ class IssueObserver < ActiveRecord::Observer
3		3
4	def after_create(issue)	4	def after_create(issue)
5	if issue.assignee && issue.assignee != current_user	5	if issue.assignee && issue.assignee != current_user
6	- Notify.new_issue_email(issue.id).deliver	6	+ Notify.delay.new_issue_email(issue.id)
7	end	7	end
8	end	8	end
9		9
	@@ -16,7 +16,7 @@ class IssueObserver < ActiveRecord::Observer		@@ -16,7 +16,7 @@ class IssueObserver < ActiveRecord::Observer
16	if status	16	if status
17	Note.create_status_change_note(issue, current_user, status)	17	Note.create_status_change_note(issue, current_user, status)
18	[issue.author, issue.assignee].compact.each do \|recipient\|	18	[issue.author, issue.assignee].compact.each do \|recipient\|
19	- Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user.id).deliver	19	+ Notify.delay.issue_status_changed_email(recipient.id, issue.id, status, current_user.id)
20	end	20	end
21	end	21	end
22	end	22	end
	@@ -27,7 +27,7 @@ class IssueObserver < ActiveRecord::Observer		@@ -27,7 +27,7 @@ class IssueObserver < ActiveRecord::Observer
27	recipient_ids = [issue.assignee_id, issue.assignee_id_was].keep_if {\|id\| id && id != current_user.id }	27	recipient_ids = [issue.assignee_id, issue.assignee_id_was].keep_if {\|id\| id && id != current_user.id }
28		28
29	recipient_ids.each do \|recipient_id\|	29	recipient_ids.each do \|recipient_id\|
30	- Notify.reassigned_issue_email(recipient_id, issue.id, issue.assignee_id_was).deliver	30	+ Notify.delay.reassigned_issue_email(recipient_id, issue.id, issue.assignee_id_was)
31	end	31	end
32	end	32	end
33	end	33	end
	@@ -3,7 +3,7 @@ class MergeRequestObserver < ActiveRecord::Observer		@@ -3,7 +3,7 @@ class MergeRequestObserver < ActiveRecord::Observer
3		3
4	def after_create(merge_request)	4	def after_create(merge_request)
5	if merge_request.assignee && merge_request.assignee != current_user	5	if merge_request.assignee && merge_request.assignee != current_user
6	- Notify.new_merge_request_email(merge_request.id).deliver	6	+ Notify.delay.new_merge_request_email(merge_request.id)
7	end	7	end
8	end	8	end
9		9
	@@ -25,7 +25,7 @@ class MergeRequestObserver < ActiveRecord::Observer		@@ -25,7 +25,7 @@ class MergeRequestObserver < ActiveRecord::Observer
25	recipients_ids.delete current_user.id	25	recipients_ids.delete current_user.id
26		26
27	recipients_ids.each do \|recipient_id\|	27	recipients_ids.each do \|recipient_id\|
28	- Notify.reassigned_merge_request_email(recipient_id, merge_request.id, merge_request.assignee_id_was).deliver	28	+ Notify.delay.reassigned_merge_request_email(recipient_id, merge_request.id, merge_request.assignee_id_was)
29	end	29	end
30	end	30	end
31	end	31	end
	@@ -11,7 +11,7 @@ class NoteObserver < ActiveRecord::Observer		@@ -11,7 +11,7 @@ class NoteObserver < ActiveRecord::Observer
11	notify_team(note)	11	notify_team(note)
12	elsif note.notify_author	12	elsif note.notify_author
13	# Notify only author of resource	13	# Notify only author of resource
14	- Notify.note_commit_email(note.commit_author.id, note.id).deliver	14	+ Notify.delay.note_commit_email(note.commit_author.id, note.id)
15	else	15	else
16	# Otherwise ignore it	16	# Otherwise ignore it
17	nil	17	nil
	@@ -26,7 +26,7 @@ class NoteObserver < ActiveRecord::Observer		@@ -26,7 +26,7 @@ class NoteObserver < ActiveRecord::Observer
26		26
27	if Notify.respond_to? notify_method	27	if Notify.respond_to? notify_method
28	team_without_note_author(note).map do \|u\|	28	team_without_note_author(note).map do \|u\|
29	- Notify.send(notify_method, u.id, note.id).deliver	29	+ Notify.delay.send(notify_method, u.id, note.id)
30	end	30	end
31	end	31	end
32	end	32	end
	@@ -2,7 +2,7 @@ class UserObserver < ActiveRecord::Observer		@@ -2,7 +2,7 @@ class UserObserver < ActiveRecord::Observer
2	def after_create(user)	2	def after_create(user)
3	log_info("User \"#{user.name}\" (#{user.email}) was created")	3	log_info("User \"#{user.name}\" (#{user.email}) was created")
4		4
5	- Notify.new_user_email(user.id, user.password).deliver	5	+ Notify.delay.new_user_email(user.id, user.password)
6	end	6	end
7		7
8	def after_destroy user	8	def after_destroy user
1	class UsersProjectObserver < ActiveRecord::Observer	1	class UsersProjectObserver < ActiveRecord::Observer
2	def after_commit(users_project)	2	def after_commit(users_project)
3	return if users_project.destroyed?	3	return if users_project.destroyed?
4	- Notify.project_access_granted_email(users_project.id).deliver	4	+ Notify.delay.project_access_granted_email(users_project.id)
5	end	5	end
6		6
7	def after_create(users_project)	7	def after_create(users_project)