rspec expectation syntax for gears

gears/carto_gears_api/spec/carto_gears_api/events/event_manager_spec.rb

@@ -31,9 +31,9 @@ describe CartoGearsApi::Events::EventManager do
   describe '#notify' do
     it 'triggers all subscribed events' do
       handler = mock
-      handler.expects(:do).once
+      handler.should_receive(:do).once
       handler2 = mock
-      handler2.expects(:do).once
+      handler2.should_receive(:do).once
 
       manager.subscribe(TestEvent) { handler.do }
       manager.subscribe(TestEvent) { handler2.do }
@@ -42,7 +42,7 @@ describe CartoGearsApi::Events::EventManager do
 
     it 'should not trigger subscribers to other events' do
       handler = mock
-      handler.expects(:do).never
+      handler.should_receive(:do).never
 
       manager.subscribe(TestEvent) { handler.do }
       manager.notify(OtherEvent.new)
@@ -50,7 +50,7 @@ describe CartoGearsApi::Events::EventManager do
 
     it 'should not trigger unsubscribed handlers' do
       handler = mock
-      handler.expects(:do).never
+      handler.should_receive(:do).never
 
       descriptor = manager.subscribe(TestEvent) { handler.do }
       manager.unsubscribe(descriptor)

gears/carto_gears_api/spec/carto_gears_api/queue/generic_job_spec.rb

@@ -8,7 +8,7 @@ describe CartoGearsApi::Queue::GenericJob do
       from = 'support@carto.com'
       to = 'backend@carto.com'
       subject = 'test email'
-      CartoGearsApi::Mailers::TestMail.expects(:test_mail).with(from, to, subject)
+      CartoGearsApi::Mailers::TestMail.should_receive(:test_mail).with(from, to, subject)
       CartoGearsApi::Queue::GenericJob.perform('CartoGearsApi::Mailers::TestMail', :test_mail, from, to, subject)
     end
   end

gears/carto_gears_api/spec/carto_gears_api/queue/jobs_service_spec.rb

@@ -10,11 +10,11 @@ describe CartoGearsApi::Queue::JobsService do
 
   describe '#send_job' do
     it 'enqueues a Resque::CartoGearsJobs::GenericJob#perform with the class, method and random parameters' do
-      ::Resque.expects(:enqueue).with(CartoGearsApi::Queue::GenericJob,
-                                      'CartoGearsApi::Mailers::TestMail',
-                                      :test_mail,
-                                      'param1',
-                                      2)
+      ::Resque.should_receive(:enqueue).with(CartoGearsApi::Queue::GenericJob,
+                                             'CartoGearsApi::Mailers::TestMail',
+                                             :test_mail,
+                                             'param1',
+                                             2)
       service.send_job('CartoGearsApi::Mailers::TestMail', :test_mail, 'param1', 2)
     end
   end

gears/carto_gears_api/spec/carto_gears_api/users_service_spec.rb

@@ -1,12 +1,12 @@
-require 'spec_helper_min'
+require 'spec_helper'
 require 'carto_gears_api/users/users_service'
 
 describe CartoGearsApi::Users::UsersService do
-  let(:service) { CartoGearsApi::Users::UsersService.new }
-
   describe '#logged_user' do
     module CartoDB; end
 
+    let(:service) { CartoGearsApi::Users::UsersService.new }
+
     # This test is 100% bound to implementation. It's mostly a PoC for unit testing
     # within Gears and should not be used as an example.
     it 'returns the logged user based on subdomain and warden' do
@@ -20,11 +20,11 @@ describe CartoGearsApi::Users::UsersService do
         quota_in_bytes: 100000,
         viewer: false
       )
-      warden = mock
-      warden.expects(:user).once.returns(user)
-      request = mock
-      request.expects(:env).once.returns('warden' => warden)
-      CartoDB.expects(:extract_subdomain).with(request).returns(user.username)
+      warden = double
+      warden.should_receive(:user).once.and_return(user)
+      request = double
+      request.should_receive(:env).once.and_return('warden' => warden)
+      CartoDB.should_receive(:extract_subdomain).with(request).and_return(user.username)
 
       logged_user = service.logged_user(request)
       logged_user.email.should eq user.email