sidekiq with green tests

Dmitriy Zaporozhets
1 parent 71bd9568
Showing 15 changed files with 70 additions and 90 deletions Show diff stats
Procfile
config/initializers/4_resque.rb
config/initializers/4_sidekiq.rb
features/steps/admin/admin_active_tab.rb
features/support/env.rb
lib/hooks/post-receive
lib/tasks/gitlab/check.rake
spec/models/system_hook_spec.rb
spec/observers/issue_observer_spec.rb
spec/observers/merge_request_observer_spec.rb
spec/observers/note_observer_spec.rb
spec/observers/user_observer_spec.rb
spec/requests/admin/admin_users_spec.rb
spec/spec_helper.rb
spec/workers/post_receive_spec.rb
 web: bundle exec rails s -p $PORT
-worker: bundle exec rake sidekiq:start
+worker: bundle exec sidekiq -q post_receive,mailer,system_hook,common,default
@@ -1,22 +0,0 @@
-# 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
@@ -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
@@ -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
@@ -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
1	web: bundle exec rails s -p $PORT	1	web: bundle exec rails s -p $PORT
2	-worker: bundle exec rake sidekiq:start	2	+worker: bundle exec sidekiq -q post_receive,mailer,system_hook,common,default
	@@ -1,22 +0,0 @@	@@ -1,22 +0,0 @@
1	-# Custom Redis configuration
2	-config_file = Rails.root.join('config', 'resque.yml')
3	-
4	-resque_url = if File.exists?(config_file)
5	- YAML.load_file(config_file)[Rails.env]
6	- else
7	- "localhost:6379"
8	- end
9	-
10	-Sidekiq.configure_server do \|config\|
11	- config.redis = {
12	- url: "redis://#{resque_url}",
13	- namespace: 'resque:gitlab'
14	- }
15	-end
16	-
17	-Sidekiq.configure_client do \|config\|
18	- config.redis = {
19	- url: "redis://#{resque_url}",
20	- namespace: 'resque:gitlab'
21	- }
22	-end
@@ -0,0 +1,22 @@		@@ -0,0 +1,22 @@
	1	+# Custom Redis configuration
	2	+config_file = Rails.root.join('config', 'resque.yml')
	3	+
	4	+resque_url = if File.exists?(config_file)
	5	+ YAML.load_file(config_file)[Rails.env]
	6	+ else
	7	+ "localhost:6379"
	8	+ end
	9	+
	10	+Sidekiq.configure_server do \|config\|
	11	+ config.redis = {
	12	+ url: "redis://#{resque_url}",
	13	+ namespace: 'resque:gitlab'
	14	+ }
	15	+end
	16	+
	17	+Sidekiq.configure_client do \|config\|
	18	+ config.redis = {
	19	+ url: "redis://#{resque_url}",
	20	+ namespace: 'resque:gitlab'
	21	+ }
	22	+end
	@@ -28,6 +28,6 @@ class AdminActiveTab < Spinach::FeatureSteps		@@ -28,6 +28,6 @@ class AdminActiveTab < Spinach::FeatureSteps
28	end	28	end
29		29
30	Then 'the active main tab should be Resque' do	30	Then 'the active main tab should be Resque' do
31	- ensure_active_main_tab('Resque')	31	+ ensure_active_main_tab('Background Jobs')
32	end	32	end
33	end	33	end
1	#!/usr/bin/env bash	1	#!/usr/bin/env bash
2		2
		3	+# Version 4.1
3	# This file was placed here by GitLab. It makes sure that your pushed commits	4	# This file was placed here by GitLab. It makes sure that your pushed commits
4	# will be processed properly.	5	# will be processed properly.
5		6
	@@ -871,7 +871,7 @@ namespace :gitlab do		@@ -871,7 +871,7 @@ namespace :gitlab do
871		871
872		872
873	namespace :resque do	873	namespace :resque do
874	- desc "GITLAB \| Check the configuration of Resque"	874	+ desc "GITLAB \| Check the configuration of Sidekiq"
875	task check: :environment do	875	task check: :environment do
876	warn_user_is_not_gitlab	876	warn_user_is_not_gitlab
877	start_checking "Resque"	877	start_checking "Resque"
	@@ -888,7 +888,7 @@ namespace :gitlab do		@@ -888,7 +888,7 @@ namespace :gitlab do
888	def check_resque_running	888	def check_resque_running
889	print "Running? ... "	889	print "Running? ... "
890		890
891	- if run_and_match("ps aux \| grep -i resque", /resque-[\d\.]+:.+$/)	891	+ if run_and_match("ps aux \| grep -i sidekiq", /sidekiq-[\d\.]+:.+$/)
892	puts "yes".green	892	puts "yes".green
893	else	893	else
894	puts "no".red	894	puts "no".red
	@@ -899,7 +899,7 @@ namespace :gitlab do		@@ -899,7 +899,7 @@ namespace :gitlab do
899	)	899	)
900	for_more_information(	900	for_more_information(
901	see_installation_guide_section("Install Init Script"),	901	see_installation_guide_section("Install Init Script"),
902	- "see log/resque.log for possible errors"	902	+ "see log/sidekiq.log for possible errors"
903	)	903	)
904	fix_and_rerun	904	fix_and_rerun
905	end	905	end
	@@ -4,7 +4,7 @@ describe PostReceive do		@@ -4,7 +4,7 @@ describe PostReceive do
4		4
5	context "as a resque worker" do	5	context "as a resque worker" do
6	it "reponds to #perform" do	6	it "reponds to #perform" do
7	- PostReceive.should respond_to(:perform)	7	+ PostReceive.new.should respond_to(:perform)
8	end	8	end
9	end	9	end
10		10
	@@ -15,7 +15,7 @@ describe PostReceive do		@@ -15,7 +15,7 @@ describe PostReceive do
15		15
16	it "fetches the correct project" do	16	it "fetches the correct project" do
17	Project.should_receive(:find_with_namespace).with(project.path_with_namespace).and_return(project)	17	Project.should_receive(:find_with_namespace).with(project.path_with_namespace).and_return(project)
18	- PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id)	18	+ PostReceive.new.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id)
19	end	19	end
20		20
21	it "does not run if the author is not in the project" do	21	it "does not run if the author is not in the project" do
	@@ -24,7 +24,7 @@ describe PostReceive do		@@ -24,7 +24,7 @@ describe PostReceive do
24	project.should_not_receive(:observe_push)	24	project.should_not_receive(:observe_push)
25	project.should_not_receive(:execute_hooks)	25	project.should_not_receive(:execute_hooks)
26		26
27	- PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id).should be_false	27	+ PostReceive.new.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id).should be_false
28	end	28	end
29		29
30	it "asks the project to trigger all hooks" do	30	it "asks the project to trigger all hooks" do
	@@ -34,7 +34,7 @@ describe PostReceive do		@@ -34,7 +34,7 @@ describe PostReceive do
34	project.should_receive(:update_merge_requests)	34	project.should_receive(:update_merge_requests)
35	project.should_receive(:observe_push)	35	project.should_receive(:observe_push)
36		36
37	- PostReceive.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id)	37	+ PostReceive.new.perform(pwd(project), 'sha-old', 'sha-new', 'refs/heads/master', key_id)
38	end	38	end
39	end	39	end
40		40