Fix models/ci/mail_service_spec.rb

- Change Notify to Ci::Notify
- Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables

3 files changed, 20 insertions, 20 deletions

diff --git a/Gemfile b/Gemfile
index 0cc69125c62..82adfb556f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -128,7 +128,7 @@ gem 'acts-as-taggable-on', '~> 3.4'
 # Background jobs
 gem 'slim', '~> 2.0.2'
 gem 'sinatra', '~> 1.4.4', require: nil
-gem 'sidekiq', '~> 3.3'
+gem 'sidekiq', '3.3.0'
 gem 'sidetiq', '~> 0.6.3'
 
 # HTTP requests
diff --git a/Gemfile.lock b/Gemfile.lock
index 2fd4d0dd65b..1f300b0c779 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -338,7 +338,7 @@ GEM
     hipchat (1.5.2)
       httparty
       mimemagic
-    hitimes (1.2.2)
+    hitimes (1.2.3)
     html-pipeline (1.11.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
@@ -637,12 +637,12 @@ GEM
     shellany (0.0.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sidekiq (3.4.2)
-      celluloid (~> 0.16.0)
-      connection_pool (~> 2.2, >= 2.2.0)
-      json (~> 1.0)
-      redis (~> 3.2, >= 3.2.1)
-      redis-namespace (~> 1.5, >= 1.5.2)
+    sidekiq (3.3.0)
+      celluloid (>= 0.16.0)
+      connection_pool (>= 2.0.0)
+      json
+      redis (>= 3.0.6)
+      redis-namespace (>= 1.3.1)
     sidetiq (0.6.3)
       celluloid (>= 0.14.1)
       ice_cube (= 0.11.1)
@@ -710,7 +710,7 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    timers (4.0.1)
+    timers (4.0.4)
       hitimes
     timfel-krb5-auth (0.8.3)
     tinder (1.9.4)
@@ -896,7 +896,7 @@ DEPENDENCIES
   settingslogic (~> 2.0.9)
   sham_rack
   shoulda-matchers (~> 2.8.0)
-  sidekiq (~> 3.3)
+  sidekiq (= 3.3.0)
   sidetiq (~> 0.6.3)
   simplecov (~> 0.10.0)
   sinatra (~> 1.4.4)
diff --git a/spec/models/ci/mail_service_spec.rb b/spec/models/ci/mail_service_spec.rb
index 564c2941bb5..b5f37b349db 100644
--- a/spec/models/ci/mail_service_spec.rb
+++ b/spec/models/ci/mail_service_spec.rb
@@ -47,8 +47,8 @@ describe Ci::MailService do
       end
 
       def should_email(email)
-        expect(Notify).to receive(:build_fail_email).with(build.id, email)
-        expect(Notify).not_to receive(:build_success_email).with(build.id, email)
+        expect(Ci::Notify).to receive(:build_fail_email).with(build.id, email)
+        expect(Ci::Notify).not_to receive(:build_success_email).with(build.id, email)
       end
     end
 
@@ -69,8 +69,8 @@ describe Ci::MailService do
       end
 
       def should_email(email)
-        expect(Notify).to receive(:build_success_email).with(build.id, email)
-        expect(Notify).not_to receive(:build_fail_email).with(build.id, email)
+        expect(Ci::Notify).to receive(:build_success_email).with(build.id, email)
+        expect(Ci::Notify).not_to receive(:build_fail_email).with(build.id, email)
       end
     end
 
@@ -97,8 +97,8 @@ describe Ci::MailService do
       end
 
       def should_email(email)
-        expect(Notify).to receive(:build_success_email).with(build.id, email)
-        expect(Notify).not_to receive(:build_fail_email).with(build.id, email)
+        expect(Ci::Notify).to receive(:build_success_email).with(build.id, email)
+        expect(Ci::Notify).not_to receive(:build_fail_email).with(build.id, email)
       end
     end
 
@@ -125,8 +125,8 @@ describe Ci::MailService do
       end
 
       def should_email(email)
-        expect(Notify).not_to receive(:build_success_email).with(build.id, email)
-        expect(Notify).not_to receive(:build_fail_email).with(build.id, email)
+        expect(Ci::Notify).not_to receive(:build_success_email).with(build.id, email)
+        expect(Ci::Notify).not_to receive(:build_fail_email).with(build.id, email)
       end
     end
 
@@ -176,8 +176,8 @@ describe Ci::MailService do
       end
 
       def should_email(email)
-        expect(Notify).not_to receive(:build_success_email).with(build.id, email)
-        expect(Notify).not_to receive(:build_fail_email).with(build.id, email)
+        expect(Ci::Notify).not_to receive(:build_success_email).with(build.id, email)
+        expect(Ci::Notify).not_to receive(:build_fail_email).with(build.id, email)
       end
     end
   end