diff --git a/spec/models/email_log_spec.rb b/spec/models/email_log_spec.rb index 789fe9d4a0c..9db88984fd2 100644 --- a/spec/models/email_log_spec.rb +++ b/spec/models/email_log_spec.rb @@ -49,7 +49,7 @@ describe EmailLog do context "when user's email does not exist email logs" do it "returns nil" do - expect(user.email_logs.last_sent_email_address).should == nil + expect(user.email_logs.last_sent_email_address).to be_nil end end end diff --git a/spec/models/user_profile_spec.rb b/spec/models/user_profile_spec.rb index 99c20427702..ad18eb8617e 100644 --- a/spec/models/user_profile_spec.rb +++ b/spec/models/user_profile_spec.rb @@ -24,12 +24,12 @@ describe UserProfile do let(:user_profile) { Fabricate.build(:user_profile) } it 'is not valid without user' do - expect(user_profile.valid?).should == false + expect(user_profile.valid?).to be false end it 'is is valid with user' do user_profile.user = Fabricate.build(:user) - expect(user_profile.valid?).should == true + expect(user_profile.valid?).to be true end it "doesn't support really long bios" do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 8cf56a5bd2b..d2d1d79afe3 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -179,7 +179,7 @@ describe User do expect(Post.where(id: @posts.map(&:id))).to be_empty @posts.each do |p| if p.post_number == 1 - expect(Topic.find_by(id: p.topic_id)).should == nil + expect(Topic.find_by(id: p.topic_id)).to be_nil end end end @@ -777,7 +777,7 @@ describe User do expect(found_user).to eq bob found_user = User.find_by_username_or_email('bob1') - expect(found_user).should == nil + expect(found_user).to be_nil found_user = User.find_by_email('bob@Example.com') expect(found_user).to eq bob @@ -786,7 +786,7 @@ describe User do expect(found_user).to eq bob found_user = User.find_by_email('bob') - expect(found_user).should == nil + expect(found_user).to be_nil found_user = User.find_by_username('bOb') expect(found_user).to eq bob