fixed some more deprecations. 20 to go

spec/components/email/styles_spec.rb

@@ -25,7 +25,7 @@ describe Email::Styles do
     end
 
     # Pending due to email effort @coding-horror made in d2fb2bc4c
-    pending "adds a max-width to images" do
+    skip "adds a max-width to images" do
       frag = basic_fragment("<img src='gigantic.jpg'>")
       expect(frag.at("img")["style"]).to match("max-width")
     end

spec/components/pretty_text_spec.rb

@@ -41,7 +41,7 @@ describe PrettyText do
     end
 
     # see: https://github.com/sparklemotion/nokogiri/issues/1173
-    pending 'allows html entities correctly' do
+    skip 'allows html entities correctly' do
       PrettyText.cook("&aleph;&pound;&#162;").should == "<p>&aleph;&pound;&#162;</p>"
     end
 

spec/mailers/user_notifications_spec.rb

@@ -25,46 +25,56 @@ describe UserNotifications do
   end
 
   describe ".signup" do
+
     subject { UserNotifications.signup(user) }
 
-    its(:to) { should == [user.email] }
+    it "works" do
-    its(:subject) { should be_present }
+      subject.to.should == [user.email]
-    its(:from) { should == [SiteSetting.notification_email] }
+      subject.subject.should be_present
-    its(:body) { should be_present }
+      subject.from.should == [SiteSetting.notification_email]
+      subject.body.should be_present
+    end
+
   end
 
   describe ".forgot_password" do
+
     subject { UserNotifications.forgot_password(user) }
 
-    its(:to) { should == [user.email] }
+    it "works" do
-    its(:subject) { should be_present }
+      subject.to.should == [user.email]
-    its(:from) { should == [SiteSetting.notification_email] }
+      subject.subject.should be_present
-    its(:body) { should be_present }
+      subject.from.should == [SiteSetting.notification_email]
+      subject.body.should be_present
+    end
+
   end
 
   describe '.digest' do
+
     subject { UserNotifications.digest(user) }
 
     context "without new topics" do
-      its(:to) { should be_blank }
+
+      it "doesn't send the email" do
+        subject.to.should be_blank
+      end
+
     end
 
     context "with new topics" do
+
       before do
         Topic.expects(:for_digest).returns([Fabricate(:topic, user: Fabricate(:coding_horror))])
         Topic.expects(:new_since_last_seen).returns(Topic.none)
       end
 
-      its(:to) { should == [user.email] }
+      it "works" do
-      its(:subject) { should be_present }
+        subject.to.should == [user.email]
-      its(:from) { should == [SiteSetting.notification_email] }
+        subject.subject.should be_present
-
+        subject.from.should == [SiteSetting.notification_email]
-      it 'should have a html body' do
-        subject.html_part.body.to_s.should be_present
-      end
-
-      it 'should have a text body' do
         subject.html_part.body.to_s.should be_present
+        subject.text_part.body.to_s.should be_present
       end
 
     end

spec/mailers/version_mailer_spec.rb

@@ -5,14 +5,21 @@ describe VersionMailer do
 
   context 'contact_email is blank' do
     before { SiteSetting.stubs(:contact_email).returns('') }
-    its(:to) { should be_blank }
+
+    it "doesn't send the email" do
+      subject.to.should be_blank
+    end
   end
 
   context 'contact_email is set' do
     before { SiteSetting.stubs(:contact_email).returns('me@example.com') }
-    its(:to) { should == ['me@example.com'] }
+
-    its(:subject) { should be_present }
+    it "works" do
-    its(:from) { should == [SiteSetting.notification_email] }
+      subject.to.should == ['me@example.com']
-    its(:body) { should be_present }
+      subject.subject.should be_present
+      subject.from.should == [SiteSetting.notification_email]
+      subject.body.should be_present
+    end
+
   end
 end

spec/models/invite_spec.rb

@@ -40,8 +40,11 @@ describe Invite do
 
     context 'saved' do
       subject { Fabricate(:invite) }
-      its(:invite_key) { should be_present }
+
-      its(:email_already_exists) { should == false }
+      it "works" do
+        subject.invite_key.should be_present
+        subject.email_already_exists.should == false
+      end
 
       it 'should store a lower case version of the email' do
         subject.email.should == iceking

spec/models/user_spec.rb

@@ -206,10 +206,13 @@ describe User do
     it { should be_valid }
     it { should_not be_admin }
     it { should_not be_approved }
-    its(:approved_at) { should be_blank }
+
-    its(:approved_by_id) { should be_blank }
+    it "is properly initialized" do
-    its(:email_private_messages) { should == true }
+      subject.approved_at.should be_blank
-    its(:email_direct ) { should == true }
+      subject.approved_by_id.should be_blank
+      subject.email_private_messages.should == true
+      subject.email_direct.should == true
+    end
 
     context 'digest emails' do
       it 'defaults to digests every week' do
@@ -230,11 +233,11 @@ describe User do
     end
 
     context 'after_save' do
-      before do
+      before { subject.save }
-        subject.save
-      end
 
-      its(:email_tokens) { should be_present }
+      it "has an email token" do
+        subject.email_tokens.should be_present
+      end
     end
 
     it "downcases email addresses" do