jpmobile 4.1.1 → 4.1.4

data/spec/unit/encoding_spec.rb

@@ -11,13 +11,13 @@ describe "Jpmobile::Mobile" do
 
     context "to_mail_subject" do
       it "should convert string to ISO-2022-JP B-Encoding when string contains Japanese" do
-        @mobile.to_mail_subject("ほげ").should == "=?ISO-2022-JP?B?GyRCJFskMhsoQg==?="
+        expect(@mobile.to_mail_subject("ほげ")).to eq("=?ISO-2022-JP?B?GyRCJFskMhsoQg==?=")
       end
     end
 
     context "to_mail_body" do
       it "should convert string to ISO-2022-JP when string contains Japanese" do
-        @mobile.to_mail_body("ほげ").should == utf8_to_jis("ほげ")
+        expect(@mobile.to_mail_body("ほげ")).to eq(utf8_to_jis("ほげ"))
       end
     end
   end
@@ -29,21 +29,21 @@ describe "Jpmobile::Mobile" do
 
     context "to_mail_subject" do
       it "should convert string to Shift_JIS B-Encoding when string contains Japanese" do
-        @mobile.to_mail_subject("ほげ").should == "=?Shift_JIS?B?gtmCsA==?="
+        expect(@mobile.to_mail_subject("ほげ")).to eq("=?Shift_JIS?B?gtmCsA==?=")
       end
 
       it "should convert emoticon  to \xf8\x9f in B-Encoding" do
-        @mobile.to_mail_subject("ほげ").should == "=?Shift_JIS?B?gtmCsPif?="
+        expect(@mobile.to_mail_subject("ほげ")).to eq("=?Shift_JIS?B?gtmCsPif?=")
       end
     end
 
     context "to_mail_body" do
       it "should convert string to Shift_JIS when string contains Japanese" do
-        @mobile.to_mail_body("ほげ").should == utf8_to_sjis("ほげ")
+        expect(@mobile.to_mail_body("ほげ")).to eq(utf8_to_sjis("ほげ"))
       end
 
       it "should convert emoticon  to \xf8\x9f" do
-        @mobile.to_mail_body("ほげ").should == utf8_to_sjis("ほげ") + sjis("\xf8\x9f")
+        expect(@mobile.to_mail_body("ほげ")).to eq(utf8_to_sjis("ほげ") + sjis("\xf8\x9f"))
       end
     end
   end
@@ -55,21 +55,21 @@ describe "Jpmobile::Mobile" do
 
     context "to_mail_subject" do
       it "should convert string to ISO-2022-JP B-Encoding when string contains Japanese" do
-        @mobile.to_mail_subject("ほげ").should == "=?ISO-2022-JP?B?GyRCJFskMhsoQg==?="
+        expect(@mobile.to_mail_subject("ほげ")).to eq("=?ISO-2022-JP?B?GyRCJFskMhsoQg==?=")
       end
 
       it "should convert emoticon  to \x75\x41 in B-Encoding" do
-        @mobile.to_mail_subject("ほげ").should == "=?ISO-2022-JP?B?GyRCJFskMnVBGyhC?="
+        expect(@mobile.to_mail_subject("ほげ")).to eq("=?ISO-2022-JP?B?GyRCJFskMnVBGyhC?=")
       end
     end
 
     context "to_mail_body" do
       it "should convert string to ISO-2022-JP when string contains Japanese" do
-        @mobile.to_mail_body("ほげ").should == utf8_to_jis("ほげ")
+        expect(@mobile.to_mail_body("ほげ")).to eq(utf8_to_jis("ほげ"))
       end
 
       it "should convert emoticon  to \x75\x41" do
-        ascii_8bit(@mobile.to_mail_body("ほげ")).should == ascii_8bit(jis("\e\x24\x42\x24\x5B\x24\x32\x75\x41\x1b\x28\x42"))
+        expect(ascii_8bit(@mobile.to_mail_body("ほげ"))).to eq(ascii_8bit(jis("\e\x24\x42\x24\x5B\x24\x32\x75\x41\x1b\x28\x42")))
       end
     end
   end
@@ -81,21 +81,21 @@ describe "Jpmobile::Mobile" do
 
     context "to_mail_subject" do
       it "should convert string to Shift_JIS B-Encoding when string contains Japanese" do
-        @mobile.to_mail_subject("ほげ").should == "=?Shift_JIS?B?gtmCsA==?="
+        expect(@mobile.to_mail_subject("ほげ")).to eq("=?Shift_JIS?B?gtmCsA==?=")
       end
 
       it "should convert emoticon  to \xf9\x8b in B-Encoding" do
-        @mobile.to_mail_subject("ほげ").should == "=?Shift_JIS?B?gtmCsPmL?="
+        expect(@mobile.to_mail_subject("ほげ")).to eq("=?Shift_JIS?B?gtmCsPmL?=")
       end
     end
 
     context "to_mail_body" do
       it "should convert string to Shift_JIS when string contains Japanese" do
-        @mobile.to_mail_body("ほげ").should == utf8_to_sjis("ほげ")
+        expect(@mobile.to_mail_body("ほげ")).to eq(utf8_to_sjis("ほげ"))
       end
 
       it "should convert emoticon  to \xf9\x8b" do
-        @mobile.to_mail_body("ほげ").should == utf8_to_sjis("ほげ") + sjis("\xf9\x8b")
+        expect(@mobile.to_mail_body("ほげ")).to eq(utf8_to_sjis("ほげ") + sjis("\xf9\x8b"))
       end
     end
   end

data/spec/unit/is_carrier_spec.rb

@@ -59,7 +59,7 @@ describe 'Jpmobile::Mobile' do
     [ %w[ Ddipocket ddipocket ] , true  ],
   ].each do |carrier, expected|
     it "#{carrier.first}##{carrier.last}? should be return #{expected}" do
-      Jpmobile::Mobile.const_get(carrier.first).new({}, {}).__send__("#{carrier.last}?").should == expected
+      expect(Jpmobile::Mobile.const_get(carrier.first).new({}, {}).__send__("#{carrier.last}?")).to eq(expected)
     end
   end
 end

data/spec/unit/mail_spec.rb

@@ -53,23 +53,23 @@ describe "Jpmobile::Mail" do
 
     context "to_s" do
       it "should contain encoded subject" do
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCS3xNVRsoQg==?=")))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCS3xNVRsoQg==?=")))
       end
 
       it "should contain encoded body" do
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42\x24\x5B\x24\x32\e\x28\x42"))))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42\x24\x5B\x24\x32\e\x28\x42"))))
       end
 
       it "should contain encoded from"do
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("=?ISO-2022-JP?B?GyRCJEEkTyRkJFUkaxsoQg==?="))))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape(ascii_8bit("=?ISO-2022-JP?B?GyRCJEEkTyRkJFUkaxsoQg==?="))))
       end
 
       it "should contain encoded to" do
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("=?ISO-2022-JP?B?GyRCJGAkOSRhJFUkNSRbJDsbKEI=?="))))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape(ascii_8bit("=?ISO-2022-JP?B?GyRCJGAkOSRhJFUkNSRbJDsbKEI=?="))))
       end
 
       it "should contain correct Content-Type:" do
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("charset=ISO-2022-JP"))))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape(ascii_8bit("charset=ISO-2022-JP"))))
       end
     end
   end
@@ -83,27 +83,27 @@ describe "Jpmobile::Mail" do
 
     context "to_s" do
       it "should contain encoded subject" do
-        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?lpyXdA==?="))
+        expect(@mail.to_s).to match(sjis_regexp("=?Shift_JIS?B?lpyXdA==?="))
       end
 
       it "should contain encoded body" do
-        @mail.to_s.should match(Regexp.escape(utf8_to_sjis("ほげ")))
+        expect(@mail.to_s).to match(Regexp.escape(utf8_to_sjis("ほげ")))
       end
 
       it "should contain encoded from" do
-        @mail.to_s.should match(sjis_regexp("gr+CzYLigtOC6Q=="))
+        expect(@mail.to_s).to match(sjis_regexp("gr+CzYLigtOC6Q=="))
       end
 
       it "should contain encoded to" do
-        @mail.to_s.should match(sjis_regexp("gt6Ct4LfgtOCs4LZgrk="))
+        expect(@mail.to_s).to match(sjis_regexp("gt6Ct4LfgtOCs4LZgrk="))
       end
 
       it "should contains encoded emoticon" do
         @mail.subject += ""
         @mail.body = "#{@mail.body}"
 
-        @mail.to_s.should match(Regexp.escape("=?Shift_JIS?B?lpyXdPif?="))
-        @mail.to_s.should match(sjis_regexp("\xF8\x9F"))
+        expect(@mail.to_s).to match(Regexp.escape("=?Shift_JIS?B?lpyXdPif?="))
+        expect(@mail.to_s).to match(sjis_regexp("\xF8\x9F"))
       end
     end
   end
@@ -117,27 +117,27 @@ describe "Jpmobile::Mail" do
 
     context "to_s" do
       it "should contain encoded subject" do
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCS3xNVRsoQg==?=")))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCS3xNVRsoQg==?=")))
       end
 
       it "should contain encoded body" do
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42\x24\x5B\x24\x32\e\x28\x42"))))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42\x24\x5B\x24\x32\e\x28\x42"))))
       end
 
       it "should contain encoded from" do
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("=?ISO-2022-JP?B?GyRCJEEkTyRkJFUkaxsoQg==?="))))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape(ascii_8bit("=?ISO-2022-JP?B?GyRCJEEkTyRkJFUkaxsoQg==?="))))
       end
 
       it "should contain encoded to" do
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("=?ISO-2022-JP?B?GyRCJGAkOSRhJFUkNSRbJDsbKEI=?="))))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape(ascii_8bit("=?ISO-2022-JP?B?GyRCJGAkOSRhJFUkNSRbJDsbKEI=?="))))
       end
 
       it "should contain encoded emoticon" do
         @mail.subject += ""
         @mail.body = "#{@mail.body}"
 
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCS3xNVXVBGyhC?=")))
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\e\x24\x42\x24\x5B\x24\x32\x75\x41\e\x28\x42"))))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCS3xNVXVBGyhC?=")))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape(ascii_8bit("\e\x24\x42\x24\x5B\x24\x32\x75\x41\e\x28\x42"))))
       end
     end
   end
@@ -151,27 +151,27 @@ describe "Jpmobile::Mail" do
 
     context "to_s" do
       it "should contain encoded subject" do
-        @mail.to_s.should match(Regexp.escape(sjis("=?Shift_JIS?B?lpyXdA==?=")))
+        expect(@mail.to_s).to match(Regexp.escape(sjis("=?Shift_JIS?B?lpyXdA==?=")))
       end
 
       it "should contain encoded body" do
-        @mail.to_s.should match(Regexp.escape(utf8_to_sjis("ほげ")))
+        expect(@mail.to_s).to match(Regexp.escape(utf8_to_sjis("ほげ")))
       end
 
       it "should contain encoded from" do
-        @mail.to_s.should match(sjis_regexp("gr+CzYLigtOC6Q=="))
+        expect(@mail.to_s).to match(sjis_regexp("gr+CzYLigtOC6Q=="))
       end
 
       it "should contain encoded to" do
-        @mail.to_s.should match(sjis_regexp("gt6Ct4LfgtOCs4LZgrk="))
+        expect(@mail.to_s).to match(sjis_regexp("gt6Ct4LfgtOCs4LZgrk="))
       end
 
       it "should contains encoded emoticon" do
         @mail.subject += ""
         @mail.body = "#{@mail.body}"
 
-        @mail.to_s.should match(Regexp.escape("=?Shift_JIS?B?lpyXdPmL?="))
-        @mail.to_s.should match(sjis_regexp("\xf9\x8b"))
+        expect(@mail.to_s).to match(Regexp.escape("=?Shift_JIS?B?lpyXdPmL?="))
+        expect(@mail.to_s).to match(sjis_regexp("\xf9\x8b"))
       end
     end
   end
@@ -192,12 +192,12 @@ describe "Jpmobile::Mail" do
       end
 
       it "should contain encoded subject" do
-        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?lb6O0I3Ml3CJnpXlgtaCzIKokFyNnoLdkL2CyYKg?="))
-        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?guiCqoLGgqSCsoK0gqKC3IK3gsaMvoKigr2CooLG?="))
-        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?grGC64K+gqqCu4Kkgs2KyJJQgsmCzZWojpaCzYle?="))
-        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?gs6CyIKigrGCxoLwkFOCtYLEgqiCooLEguCC54Ki?="))
-        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?gr2CooLGi+qMvoLwkuaCt4LpjMyCyZW+jtCCzYjb?="))
-        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?jp2CtYLEgqKC6YLMgsWCtw==?="))
+        expect(@mail.to_s).to match(sjis_regexp("=?Shift_JIS?B?lb6O0I3Ml3CJnpXlgtaCzIKokFyNnoLdkL2CyYKg?="))
+        expect(@mail.to_s).to match(sjis_regexp("=?Shift_JIS?B?guiCqoLGgqSCsoK0gqKC3IK3gsaMvoKigr2CooLG?="))
+        expect(@mail.to_s).to match(sjis_regexp("=?Shift_JIS?B?grGC64K+gqqCu4Kkgs2KyJJQgsmCzZWojpaCzYle?="))
+        expect(@mail.to_s).to match(sjis_regexp("=?Shift_JIS?B?gs6CyIKigrGCxoLwkFOCtYLEgqiCooLEguCC54Ki?="))
+        expect(@mail.to_s).to match(sjis_regexp("=?Shift_JIS?B?gr2CooLGi+qMvoLwkuaCt4LpjMyCyZW+jtCCzYjb?="))
+        expect(@mail.to_s).to match(sjis_regexp("=?Shift_JIS?B?jp2CtYLEgqKC6YLMgsWCtw==?="))
       end
     end
 
@@ -209,12 +209,12 @@ describe "Jpmobile::Mail" do
       end
 
       it "should contain encoded subject" do
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCSkA8UjpOTVExfkpnJFgkTiQqPz05fiRfQD8kSyQiGyhC?=")))
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJGokLCRIJCYkNCQ2JCQkXiQ5JEg4QCQkJD8kJCRIGyhC?=")))
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJDMkbSRAJCwkPSQmJE80SkMxJEskT0oqO3YkTzE/GyhC?=")))
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJFAkSiQkJDMkSCRyPzQkNyRGJCokJCRGJGIkaSQkGyhC?=")))
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJD8kJCRINmw4QCRyRGgkOSRrOE4kS0pAPFIkTzBdGyhC?=")))
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCO30kNyRGJCQkayROJEckORsoQg==?=")))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCSkA8UjpOTVExfkpnJFgkTiQqPz05fiRfQD8kSyQiGyhC?=")))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJGokLCRIJCYkNCQ2JCQkXiQ5JEg4QCQkJD8kJCRIGyhC?=")))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJDMkbSRAJCwkPSQmJE80SkMxJEskT0oqO3YkTzE/GyhC?=")))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJFAkSiQkJDMkSCRyPzQkNyRGJCokJCRGJGIkaSQkGyhC?=")))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJD8kJCRINmw4QCRyRGgkOSRrOE4kS0pAPFIkTzBdGyhC?=")))
+        expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCO30kNyRGJCQkayROJEckORsoQg==?=")))
       end
     end
 
@@ -226,12 +226,12 @@ describe "Jpmobile::Mail" do
       end
 
       it "should contain encoded subject" do
-        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?lb6O0I3Ml3CJnpXlgtaCzIKokFyNnoLdkL2CyYKg?="))
-        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?guiCqoLGgqSCsoK0gqKC3IK3gsaMvoKigr2CooLG?="))
-        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?grGC64K+gqqCu4Kkgs2KyJJQgsmCzZWojpaCzYle?="))
-        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?gs6CyIKigrGCxoLwkFOCtYLEgqiCooLEguCC54Ki?="))
-        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?gr2CooLGi+qMvoLwkuaCt4LpjMyCyZW+jtCCzYjb?="))
-        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?jp2CtYLEgqKC6YLMgsWCtw==?="))
+        expect(@mail.to_s).to match(sjis_regexp("=?Shift_JIS?B?lb6O0I3Ml3CJnpXlgtaCzIKokFyNnoLdkL2CyYKg?="))
+        expect(@mail.to_s).to match(sjis_regexp("=?Shift_JIS?B?guiCqoLGgqSCsoK0gqKC3IK3gsaMvoKigr2CooLG?="))
+        expect(@mail.to_s).to match(sjis_regexp("=?Shift_JIS?B?grGC64K+gqqCu4Kkgs2KyJJQgsmCzZWojpaCzYle?="))
+        expect(@mail.to_s).to match(sjis_regexp("=?Shift_JIS?B?gs6CyIKigrGCxoLwkFOCtYLEgqiCooLEguCC54Ki?="))
+        expect(@mail.to_s).to match(sjis_regexp("=?Shift_JIS?B?gr2CooLGi+qMvoLwkuaCt4LpjMyCyZW+jtCCzYjb?="))
+        expect(@mail.to_s).to match(sjis_regexp("=?Shift_JIS?B?jp2CtYLEgqKC6YLMgsWCtw==?="))
       end
     end
 
@@ -244,12 +244,12 @@ describe "Jpmobile::Mail" do
 
       context "to_s" do
         it "should contain encoded subject" do
-          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCSkA8UjpOTVExfkpnJFgkTiQqPz05fiRfQD8kSyQiGyhC?=")))
-          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJGokLCRIJCYkNCQ2JCQkXiQ5JEg4QCQkJD8kJCRIGyhC?=")))
-          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJDMkbSRAJCwkPSQmJE80SkMxJEskT0oqO3YkTzE/GyhC?=")))
-          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJFAkSiQkJDMkSCRyPzQkNyRGJCokJCRGJGIkaSQkGyhC?=")))
-          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJD8kJCRINmw4QCRyRGgkOSRrOE4kS0pAPFIkTzBdGyhC?=")))
-          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCO30kNyRGJCQkayROJEckORsoQg==?=")))
+          expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCSkA8UjpOTVExfkpnJFgkTiQqPz05fiRfQD8kSyQiGyhC?=")))
+          expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJGokLCRIJCYkNCQ2JCQkXiQ5JEg4QCQkJD8kJCRIGyhC?=")))
+          expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJDMkbSRAJCwkPSQmJE80SkMxJEskT0oqO3YkTzE/GyhC?=")))
+          expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJFAkSiQkJDMkSCRyPzQkNyRGJCokJCRGJGIkaSQkGyhC?=")))
+          expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJD8kJCRINmw4QCRyRGgkOSRrOE4kS0pAPFIkTzBdGyhC?=")))
+          expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCO30kNyRGJCQkayROJEckORsoQg==?=")))
         end
       end
     end
@@ -272,9 +272,9 @@ describe "Jpmobile::Mail" do
 
       context "to_s" do
         it "should contain encoded subject" do
-          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCQD5OcRsoQjIwMTIbJEJHLxsoQjA5GyRCN24bKEIwMxskQkZ8JE86IxsoQg==?=")))
-          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCRnwkSyRKJGskbyQxJEAkLBsoQjEwGyRCO34bKEIxNhskQkosOD0bKEI=?=")))
-          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCOl8kTiQzJE47fjRWJEckTyRJJCYkKyRKGyhC?=")))
+          expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCQD5OcRsoQjIwMTIbJEJHLxsoQjA5GyRCN24bKEIwMxskQkZ8JE86IxsoQg==?=")))
+          expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCRnwkSyRKJGskbyQxJEAkLBsoQjEwGyRCO34bKEIxNhskQkosOD0bKEI=?=")))
+          expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCOl8kTiQzJE47fjRWJEckTyRJJCYkKyRKGyhC?=")))
         end
       end
     end
@@ -291,25 +291,25 @@ describe "Jpmobile::Mail" do
     it "should encodes itself successfully" do
       @mail.attachments['photo.jpg'] = @photo
 
-      lambda {
+      expect {
         @mail.to_s
-      }.should_not raise_error
+      }.not_to raise_error
     end
 
     it "should encodes itself successfully with an inline attachment" do
       @mail.attachments.inline['photo.jpg'] = @photo
 
-      lambda {
+      expect {
         @mail.to_s
-      }.should_not raise_error
+      }.not_to raise_error
     end
 
     it "should encodes itself successfully with an UTF-8 filename attachment" do
       @mail.attachments.inline['日本語のファイル名です.jpg'] = @photo
 
-      lambda {
+      expect {
         @mail.to_s
-      }.should_not raise_error
+      }.not_to raise_error
     end
   end
 
@@ -324,13 +324,13 @@ describe "Jpmobile::Mail" do
     it "wave dash converting correctly" do
       @mail.body = '10:00〜12:00'
 
-      ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x31\x30\x3a\x30\x30\x1b\x24\x42\x21\x41\x1b\x28\x42\x31\x32\x3a\x30\x30"))))
+      expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape(ascii_8bit("\x31\x30\x3a\x30\x30\x1b\x24\x42\x21\x41\x1b\x28\x42\x31\x32\x3a\x30\x30"))))
     end
 
     it "full width tilde converting correctly" do
       @mail.body = "10:00#{[0xff5e].pack("U")}12:00"
 
-      ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x31\x30\x3a\x30\x30\x1b\x24\x42\x21\x41\x1b\x28\x42\x31\x32\x3a\x30\x30"))))
+      expect(ascii_8bit(@mail.to_s)).to match(Regexp.compile(Regexp.escape(ascii_8bit("\x31\x30\x3a\x30\x30\x1b\x24\x42\x21\x41\x1b\x28\x42\x31\x32\x3a\x30\x30"))))
     end
   end
 
@@ -343,9 +343,9 @@ describe "Jpmobile::Mail" do
 
     it "delivers through SMTP" do
       @mail.delivery_method :smtp, {:enable_starttls_auto => false}
-      lambda {
+      expect {
         @mail.deliver
-      }.should_not raise_error
+      }.not_to raise_error
 
       Mail::TestMailer.deliveries.size
     end
@@ -367,7 +367,7 @@ describe "Jpmobile::Mail" do
       @mail.mobile = mobile
       @mail.from = '<えーゆー> au@ezweb.ne.jp'
 
-      @mail.encoded.should match(/content-transfer-encoding: 7bit/i)
+      expect(@mail.encoded).to match(/content-transfer-encoding: 7bit/i)
     end
 
     it 'should not convert content-transfer-encoding with BINARY' do
@@ -382,8 +382,8 @@ describe "Jpmobile::Mail" do
       @mail.mobile = mobile
       @mail.from = '<えーゆー> au@ezweb.ne.jp'
 
-      @mail.encoded.should match(/content-transfer-encoding: base64/i)
-      @mail.encoded.should match(data)
+      expect(@mail.encoded).to match(/content-transfer-encoding: base64/i)
+      expect(@mail.encoded).to match(data)
     end
   end
 end

data/spec/unit/mobile/iphone_spec.rb

@@ -5,30 +5,30 @@ describe Jpmobile::Mobile::Iphone do
   describe 'iOS 4.0' do
     it "unicode_emoticon? should be false" do
       request = double('request')
-      request.stub(:user_agent) {'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_4 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8K2 Safari/6533.18.5'}
+      allow(request).to receive(:user_agent) {'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_4 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8K2 Safari/6533.18.5'}
 
       mobile = Jpmobile::Mobile::Iphone.new({}, request)
-      mobile.unicode_emoticon?.should be_falsey
+      expect(mobile.unicode_emoticon?).to be_falsey
     end
   end
 
   describe 'iOS 5.0' do
     it "unicode_emoticon? should be true" do
       request = double('request')
-      request.stub(:user_agent) {'Mozilla/5.0 (iPhone; CPU iPhone OS 5_1_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B206 Safari/7534.48.3'}
+      allow(request).to receive(:user_agent) {'Mozilla/5.0 (iPhone; CPU iPhone OS 5_1_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B206 Safari/7534.48.3'}
 
       mobile = Jpmobile::Mobile::Iphone.new({}, request)
-      mobile.unicode_emoticon?.should be_truthy
+      expect(mobile.unicode_emoticon?).to be_truthy
     end
   end
 
   describe 'iOS 6.0' do
     it "unicode_emoticon? should be true" do
       request = double('request')
-      request.stub(:user_agent) {'Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A403 Safari/8536.25'}
+      allow(request).to receive(:user_agent) {'Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A403 Safari/8536.25'}
 
       mobile = Jpmobile::Mobile::Iphone.new({}, request)
-      mobile.unicode_emoticon?.should be_truthy
+      expect(mobile.unicode_emoticon?).to be_truthy
     end
   end
 end