Fix deprecation warnings

ruby-china · May 6, 2016 · 405f160 · 405f160
1 parent d57bcf2
commit 405f160
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
@@ -13,21 +13,21 @@
         referrer = "#{request.base_url}/account/edit"
         request.env['HTTP_REFERER'] = referrer
         get :new
-        session['user_return_to'].should be referrer
+        expect(session['user_return_to']).to eq referrer
       end
 
       it "should skip referrer if it's from other site" do
         referrer = "http://#{SecureRandom.hex(4)}.com"
         request.env['HTTP_REFERER'] = referrer
         get :new
-        session['user_return_to'].should be_nil
+        expect(session['user_return_to']).to eq nil
       end
 
       it 'should skip referrer if it is user sign in page' do
         referrer = "#{request.base_url}/account/sign_in"
         request.env['HTTP_REFERER'] = referrer
         get :new
-        session['user_return_to'].should be_nil
+        expect(session['user_return_to']).to eq nil
       end
     end
   end

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -3,7 +3,7 @@
 
 describe User, type: :model do
   before do
-    User.any_instance.stub(:update_index).and_return(true)
+    allow_any_instance_of(User).to receive(:update_index).and_return(true)
   end
   let(:topic) { create :topic }
   let(:user)  { create :user }
@@ -66,7 +66,7 @@
 
   describe '#read_topic?' do
     before do
-      User.any_instance.stub(:update_index).and_return(true)
+      allow_any_instance_of(User).to receive(:update_index).and_return(true)
       Rails.cache.write("user:#{user.id}:topic_read:#{topic.id}", nil)
     end