jpmobile 4.1.1 → 4.1.4

data/spec/rack/jpmobile/params_filter_spec.rb

@@ -39,13 +39,13 @@ describe Jpmobile::Rack::ParamsFilter do
 
           res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(UnitApplication.new)).call(res)
           req = Rack::Request.new(res[1])
-          req.params.size.should == 4
+          expect(req.params.size).to eq(4)
 
-          req.params[ascii_8bit(@query_params.keys.first.dup)].should == ascii_8bit(@query_params[@query_params.keys.first])
-          req.params[ascii_8bit(@query_params.keys.last.dup)].should  == ascii_8bit(@query_params[@query_params.keys.last])
+          expect(req.params[ascii_8bit(@query_params.keys.first.dup)]).to eq(ascii_8bit(@query_params[@query_params.keys.first]))
+          expect(req.params[ascii_8bit(@query_params.keys.last.dup)]).to  eq(ascii_8bit(@query_params[@query_params.keys.last]))
 
-          req.params[ascii_8bit(@form_params.keys.first.dup)].should == ascii_8bit(@form_params[@form_params.keys.first])
-          req.params[ascii_8bit(@form_params.keys.last.dup)].should  == ascii_8bit(@form_params[@form_params.keys.last])
+          expect(req.params[ascii_8bit(@form_params.keys.first.dup)]).to eq(ascii_8bit(@form_params[@form_params.keys.first]))
+          expect(req.params[ascii_8bit(@form_params.keys.last.dup)]).to  eq(ascii_8bit(@form_params[@form_params.keys.last]))
         end
       end
 
@@ -60,13 +60,13 @@ describe Jpmobile::Rack::ParamsFilter do
 
           res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(UnitApplication.new)).call(res)
           req = Rack::Request.new(res[1])
-          req.params.size.should == 4
+          expect(req.params.size).to eq(4)
 
-          req.params[ascii_8bit(@query_params.keys.first.dup)].should == ascii_8bit(@query_params[@query_params.keys.first])
-          req.params[ascii_8bit(@query_params.keys.last.dup)].should  == ascii_8bit(@query_params[@query_params.keys.last])
+          expect(req.params[ascii_8bit(@query_params.keys.first.dup)]).to eq(ascii_8bit(@query_params[@query_params.keys.first]))
+          expect(req.params[ascii_8bit(@query_params.keys.last.dup)]).to  eq(ascii_8bit(@query_params[@query_params.keys.last]))
 
-          req.params[ascii_8bit(@form_params.keys.first.dup)].should == ascii_8bit(@form_params[@form_params.keys.first])
-          req.params[ascii_8bit(@form_params.keys.last.dup)].should  == ascii_8bit(@form_params[@form_params.keys.last])
+          expect(req.params[ascii_8bit(@form_params.keys.first.dup)]).to eq(ascii_8bit(@form_params[@form_params.keys.first]))
+          expect(req.params[ascii_8bit(@form_params.keys.last.dup)]).to  eq(ascii_8bit(@form_params[@form_params.keys.last]))
         end
       end
     end
@@ -92,13 +92,13 @@ describe Jpmobile::Rack::ParamsFilter do
 
           res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(UnitApplication.new)).call(res)
           req = Rack::Request.new(res[1])
-          req.params.size.should == 4
+          expect(req.params.size).to eq(4)
 
-          req.params[ascii_8bit(@query_params.keys.first.dup)].should == ascii_8bit(@query_params[@query_params.keys.first])
-          req.params[ascii_8bit(@query_params.keys.last.dup)].should  == ascii_8bit(@query_params[@query_params.keys.last])
+          expect(req.params[ascii_8bit(@query_params.keys.first.dup)]).to eq(ascii_8bit(@query_params[@query_params.keys.first]))
+          expect(req.params[ascii_8bit(@query_params.keys.last.dup)]).to  eq(ascii_8bit(@query_params[@query_params.keys.last]))
 
-          req.params[ascii_8bit(@form_params.keys.first.dup)].should == ascii_8bit(@form_params[@form_params.keys.first])
-          req.params[ascii_8bit(@form_params.keys.last.dup)].should  == ascii_8bit(@form_params[@form_params.keys.last])
+          expect(req.params[ascii_8bit(@form_params.keys.first.dup)]).to eq(ascii_8bit(@form_params[@form_params.keys.first]))
+          expect(req.params[ascii_8bit(@form_params.keys.last.dup)]).to  eq(ascii_8bit(@form_params[@form_params.keys.last]))
         end
       end
     end
@@ -119,10 +119,10 @@ describe Jpmobile::Rack::ParamsFilter do
 
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(UnitApplication.new)).call(res)
         req = Rack::Request.new(res[1])
-        req.params.size.should == 2
+        expect(req.params.size).to eq(2)
 
-        req.params["hoge"].should == ascii_8bit("\356\230\276")
-        req.params["foo"].should  == ascii_8bit("\356\231\200")
+        expect(req.params["hoge"]).to eq(ascii_8bit("\356\230\276"))
+        expect(req.params["foo"]).to  eq(ascii_8bit("\356\231\200"))
       end
     end
 
@@ -140,10 +140,10 @@ describe Jpmobile::Rack::ParamsFilter do
 
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(UnitApplication.new)).call(res)
         req = Rack::Request.new(res[1])
-        req.params.size.should == 2
+        expect(req.params.size).to eq(2)
 
-        req.params["hoge"].should == ascii_8bit("\356\222\201")
-        req.params["foo"].should  == ascii_8bit("\356\224\242")
+        expect(req.params["hoge"]).to eq(ascii_8bit("\356\222\201"))
+        expect(req.params["foo"]).to  eq(ascii_8bit("\356\224\242"))
       end
     end
 
@@ -161,10 +161,10 @@ describe Jpmobile::Rack::ParamsFilter do
 
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(UnitApplication.new)).call(res)
         req = Rack::Request.new(res[1])
-        req.params.size.should == 2
+        expect(req.params.size).to eq(2)
 
-        req.params["hoge"].should == ascii_8bit("\xef\x80\x81")
-        req.params["foo"].should  == ascii_8bit("\xef\x88\x9c")
+        expect(req.params["hoge"]).to eq(ascii_8bit("\xef\x80\x81"))
+        expect(req.params["foo"]).to  eq(ascii_8bit("\xef\x88\x9c"))
       end
     end
   end
@@ -184,9 +184,9 @@ describe Jpmobile::Rack::ParamsFilter do
 
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(UnitApplication.new)).call(res)
         req = Rack::Request.new(res[1])
-        req.params.size.should == 1
+        expect(req.params.size).to eq(1)
 
-        req.params["foo"].should  == ascii_8bit(token)
+        expect(req.params["foo"]).to  eq(ascii_8bit(token))
       end
     end
   end
@@ -205,9 +205,9 @@ describe Jpmobile::Rack::ParamsFilter do
 
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(UnitApplication.new)).call(res)
         req = Rack::Request.new(res[1])
-        req.params.size.should == 0
+        expect(req.params.size).to eq(0)
 
-        req.body.read.should  == form_string
+        expect(req.body.read).to  eq(form_string)
       end
     end
   end
@@ -226,9 +226,9 @@ describe Jpmobile::Rack::ParamsFilter do
 
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(UnitApplication.new)).call(res)
         req = Rack::Request.new(res[1])
-        req.params.size.should == 0
+        expect(req.params.size).to eq(0)
 
-        req.body.read.should  == form_string
+        expect(req.body.read).to  eq(form_string)
       end
     end
   end

data/spec/rack/jpmobile/softbank_spec.rb

@@ -11,14 +11,14 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
         'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].class.should            == Jpmobile::Mobile::Softbank
-      env['rack.jpmobile'].position.should be_nil
-      env['rack.jpmobile'].serial_number.should    == "000000000000000"
-      env['rack.jpmobile'].ident.should            == "000000000000000"
-      env['rack.jpmobile'].ident_device.should     == "000000000000000"
-      env['rack.jpmobile'].ident_subscriber.should be_nil
-      env['rack.jpmobile'].supports_cookie?.should be_truthy
-      env['rack.jpmobile'].smart_phone?.should     be_falsey
+      expect(env['rack.jpmobile'].class).to            eq(Jpmobile::Mobile::Softbank)
+      expect(env['rack.jpmobile'].position).to be_nil
+      expect(env['rack.jpmobile'].serial_number).to    eq("000000000000000")
+      expect(env['rack.jpmobile'].ident).to            eq("000000000000000")
+      expect(env['rack.jpmobile'].ident_device).to     eq("000000000000000")
+      expect(env['rack.jpmobile'].ident_subscriber).to be_nil
+      expect(env['rack.jpmobile'].supports_cookie?).to be_truthy
+      expect(env['rack.jpmobile'].smart_phone?).to     be_falsey
     end
 
     it "X_JPHONE_UID 付きの 910T を判別できること" do
@@ -28,12 +28,12 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
         "HTTP_X_JPHONE_UID" => "aaaaaaaaaaaaaaaa")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].serial_number.should    == "000000000000000"
-      env['rack.jpmobile'].x_jphone_uid.should     == "aaaaaaaaaaaaaaaa"
-      env['rack.jpmobile'].ident.should            == "aaaaaaaaaaaaaaaa"
-      env['rack.jpmobile'].ident_device.should     == "000000000000000"
-      env['rack.jpmobile'].ident_subscriber.should == "aaaaaaaaaaaaaaaa"
-      env['rack.jpmobile'].supports_cookie?.should be_truthy
+      expect(env['rack.jpmobile'].serial_number).to    eq("000000000000000")
+      expect(env['rack.jpmobile'].x_jphone_uid).to     eq("aaaaaaaaaaaaaaaa")
+      expect(env['rack.jpmobile'].ident).to            eq("aaaaaaaaaaaaaaaa")
+      expect(env['rack.jpmobile'].ident_device).to     eq("000000000000000")
+      expect(env['rack.jpmobile'].ident_subscriber).to eq("aaaaaaaaaaaaaaaa")
+      expect(env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
 
     it "V903T を判別できること" do
@@ -42,10 +42,10 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
         'HTTP_USER_AGENT' => "Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].class.should            == Jpmobile::Mobile::Vodafone
-      env['rack.jpmobile'].position.should be_nil
-      env['rack.jpmobile'].ident.should be_nil
-      env['rack.jpmobile'].supports_cookie?.should be_truthy
+      expect(env['rack.jpmobile'].class).to            eq(Jpmobile::Mobile::Vodafone)
+      expect(env['rack.jpmobile'].position).to be_nil
+      expect(env['rack.jpmobile'].ident).to be_nil
+      expect(env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
   end
 
@@ -57,11 +57,11 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
         "QUERY_STRING" => "pos=N43.3.18.42E141.21.1.88&geo=wgs84&x-acr=1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_within(1e-7).of(43.05511667)
-      env['rack.jpmobile'].position.lon.should be_within(1e-7).of(141.3505222)
-      env['rack.jpmobile'].position.options['pos'].should   == "N43.3.18.42E141.21.1.88"
-      env['rack.jpmobile'].position.options['geo'].should   == "wgs84"
-      env['rack.jpmobile'].position.options['x-acr'].should == "1"
+      expect(env['rack.jpmobile'].position.lat).to be_within(1e-7).of(43.05511667)
+      expect(env['rack.jpmobile'].position.lon).to be_within(1e-7).of(141.3505222)
+      expect(env['rack.jpmobile'].position.options['pos']).to   eq("N43.3.18.42E141.21.1.88")
+      expect(env['rack.jpmobile'].position.options['geo']).to   eq("wgs84")
+      expect(env['rack.jpmobile'].position.options['x-acr']).to eq("1")
     end
   end
 
@@ -73,7 +73,7 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
         "REMOTE_ADDR"=>"210.146.7.199")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_truthy
+      expect(env['rack.jpmobile'].valid_ip?).to be_truthy
     end
 
     it "正しくないIPアドレス空間からのアクセスを判断できること" do
@@ -83,7 +83,7 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
         "REMOTE_ADDR"=>"127.0.0.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_falsey
+      expect(env['rack.jpmobile'].valid_ip?).to be_falsey
     end
   end
 
@@ -96,12 +96,12 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
         "HTTP_X_JPHONE_COLOR"=>"C262144")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].display.width.should           == 240
-      env['rack.jpmobile'].display.height.should          == 320
-      env['rack.jpmobile'].display.physical_width.should  == 240
-      env['rack.jpmobile'].display.physical_height.should == 320
-      env['rack.jpmobile'].display.color?.should be_truthy
-      env['rack.jpmobile'].display.colors.should          == 262144
+      expect(env['rack.jpmobile'].display.width).to           eq(240)
+      expect(env['rack.jpmobile'].display.height).to          eq(320)
+      expect(env['rack.jpmobile'].display.physical_width).to  eq(240)
+      expect(env['rack.jpmobile'].display.physical_height).to eq(320)
+      expect(env['rack.jpmobile'].display.color?).to be_truthy
+      expect(env['rack.jpmobile'].display.colors).to          eq(262144)
     end
 
     it "端末の画面情報が渡ってない場合に正しく動作すること" do
@@ -110,14 +110,14 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
         'HTTP_USER_AGENT' => "Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].display.width.should  be_nil
-      env['rack.jpmobile'].display.height.should be_nil
-      env['rack.jpmobile'].display.browser_width.should   be_nil
-      env['rack.jpmobile'].display.browser_height.should  be_nil
-      env['rack.jpmobile'].display.physical_width.should  be_nil
-      env['rack.jpmobile'].display.physical_height.should be_nil
-      env['rack.jpmobile'].display.color?.should be_nil
-      env['rack.jpmobile'].display.colors.should be_nil
+      expect(env['rack.jpmobile'].display.width).to  be_nil
+      expect(env['rack.jpmobile'].display.height).to be_nil
+      expect(env['rack.jpmobile'].display.browser_width).to   be_nil
+      expect(env['rack.jpmobile'].display.browser_height).to  be_nil
+      expect(env['rack.jpmobile'].display.physical_width).to  be_nil
+      expect(env['rack.jpmobile'].display.physical_height).to be_nil
+      expect(env['rack.jpmobile'].display.color?).to be_nil
+      expect(env['rack.jpmobile'].display.colors).to be_nil
     end
   end
 end

data/spec/rack/jpmobile/willcom_spec.rb

@@ -11,10 +11,10 @@ describe Jpmobile::Rack::MobileCarrier, "willcom" do
         'HTTP_USER_AGENT' => "Mozilla/3.0(WILLCOM;KYOCERA/WX310K/2;1.2.2.16.000000/0.1/C100) Opera 7.0")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].class.should == Jpmobile::Mobile::Willcom
-      env['rack.jpmobile'].position.should be_nil
-      env['rack.jpmobile'].ident.should be_nil
-      env['rack.jpmobile'].supports_cookie?.should be_truthy
+      expect(env['rack.jpmobile'].class).to eq(Jpmobile::Mobile::Willcom)
+      expect(env['rack.jpmobile'].position).to be_nil
+      expect(env['rack.jpmobile'].ident).to be_nil
+      expect(env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
 
     it "AH-H3001V が判別できること" do
@@ -23,10 +23,10 @@ describe Jpmobile::Rack::MobileCarrier, "willcom" do
         'HTTP_USER_AGENT' => "Mozilla/3.0(DDIPOCKET;KYOCERA/AH-K3001V/1.8.2.71.000000/0.1/C100) Opera 7.0")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].class.should == Jpmobile::Mobile::Ddipocket
-      env['rack.jpmobile'].position.should be_nil
-      env['rack.jpmobile'].ident.should be_nil
-      env['rack.jpmobile'].supports_cookie?.should be_truthy
+      expect(env['rack.jpmobile'].class).to eq(Jpmobile::Mobile::Ddipocket)
+      expect(env['rack.jpmobile'].position).to be_nil
+      expect(env['rack.jpmobile'].ident).to be_nil
+      expect(env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
   end
 
@@ -38,8 +38,8 @@ describe Jpmobile::Rack::MobileCarrier, "willcom" do
         "QUERY_STRING" => "pos=N43.04.34.049E141.21.03.279")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].position.lat.should be_within(1e-4).of(43.078568)
-      env['rack.jpmobile'].position.lon.should be_within(1e-4).of(141.347223)
+      expect(env['rack.jpmobile'].position.lat).to be_within(1e-4).of(43.078568)
+      expect(env['rack.jpmobile'].position.lon).to be_within(1e-4).of(141.347223)
     end
   end
 
@@ -51,7 +51,7 @@ describe Jpmobile::Rack::MobileCarrier, "willcom" do
         "REMOTE_ADDR" => "61.198.142.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_truthy
+      expect(env['rack.jpmobile'].valid_ip?).to be_truthy
     end
 
     it "正しくないIPアドレス空間からのアクセスを判断できること" do
@@ -61,7 +61,7 @@ describe Jpmobile::Rack::MobileCarrier, "willcom" do
         "REMOTE_ADDR" => "127.0.0.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_falsey
+      expect(env['rack.jpmobile'].valid_ip?).to be_falsey
     end
   end
 end

data/spec/rack/jpmobile/windows_phone.rb

@@ -11,10 +11,10 @@ describe Jpmobile::Rack::MobileCarrier, "Windows Phone" do
         'HTTP_USER_AGENT' => 'Mozilla/4.0 (Compatible; MSIE 6.0; Windows NT 5.1 T-01A_6.5; Windows Phone 6.5)')
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].class.should            == Jpmobile::Mobile::WindowsPhone
-      env['rack.jpmobile'].position.should         be_nil
-      env['rack.jpmobile'].smart_phone?.should     be_truthy
-      env['rack.jpmobile'].supports_cookie?.should be_truthy
+      expect(env['rack.jpmobile'].class).to            eq(Jpmobile::Mobile::WindowsPhone)
+      expect(env['rack.jpmobile'].position).to         be_nil
+      expect(env['rack.jpmobile'].smart_phone?).to     be_truthy
+      expect(env['rack.jpmobile'].supports_cookie?).to be_truthy
     end
   end
 end

data/spec/unit/decorated_mail_spec.rb

@@ -34,7 +34,7 @@ describe "decorated mails" do
 
     it "top level content-type should be 'multipart/mixed'" do
       @mail.rearrange!
-      @mail.content_type.should match('multipart/mixed')
+      expect(@mail.content_type).to match('multipart/mixed')
     end
   end
 
@@ -52,7 +52,7 @@ describe "decorated mails" do
 
     it "top level content-type should be 'multipart/mixed'" do
       @mail.rearrange!
-      @mail.content_type.should match('multipart/mixed')
+      expect(@mail.content_type).to match('multipart/mixed')
     end
   end
 
@@ -70,7 +70,7 @@ describe "decorated mails" do
 
     it "top level content-type should be 'multipart/mixed'" do
       @mail.rearrange!
-      @mail.content_type.should match('multipart/mixed')
+      expect(@mail.content_type).to match('multipart/mixed')
     end
   end
 end

data/spec/unit/email_spec.rb

@@ -22,7 +22,7 @@ describe 'Jpmobile::Email' do
   ].each do |email_addr, carrier|
     it "#detect should return #{carrier} when take #{email_addr} as EmailAddr" do
       Jpmobile::Email.japanese_mail_address_regexp = nil
-      Jpmobile::Email.detect(email_addr).should == carrier
+      expect(Jpmobile::Email.detect(email_addr)).to eq(carrier)
     end
   end
 
@@ -50,28 +50,28 @@ describe 'Jpmobile::Email' do
   ].each do |line, carrier|
     it "#detect_from_mail_header should return #{carrier} when take mail header #{line}}" do
       Jpmobile::Email.japanese_mail_address_regexp = nil
-      Jpmobile::Email.detect_from_mail_header(line).should == carrier
+      expect(Jpmobile::Email.detect_from_mail_header(line)).to eq(carrier)
     end
   end
 
   describe "japanese_mail_address_regexp" do
     it "#detect_from_mail_header should return Jpmobile::Mobile::AbstractMobile when hoge.jp" do
       Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp[^a-zA-Z\.\-]/)
-      Jpmobile::Email.detect_from_mail_header('From: Hoge Fuga <fuga@hoge.jp>').should == Jpmobile::Mobile::AbstractMobile
+      expect(Jpmobile::Email.detect_from_mail_header('From: Hoge Fuga <fuga@hoge.jp>')).to eq(Jpmobile::Mobile::AbstractMobile)
     end
   end
 
   describe "convertable?" do
     it "return true when text/plain; charset=iso-2022-jp" do
-      Jpmobile::Email.convertable?('text/plain; charset=iso-2022-jp').should be_truthy
+      expect(Jpmobile::Email.convertable?('text/plain; charset=iso-2022-jp')).to be_truthy
     end
 
     it "return true when text/html; charset=shift_jis" do
-      Jpmobile::Email.convertable?('text/html; charset=shift_jis').should be_truthy
+      expect(Jpmobile::Email.convertable?('text/html; charset=shift_jis')).to be_truthy
     end
 
     it "return nil when image/jpeg; name=\"20098calendar01.jpg\"" do
-      Jpmobile::Email.convertable?('image/jpeg; name="20098calendar01.jpg"').should be_nil
+      expect(Jpmobile::Email.convertable?('image/jpeg; name="20098calendar01.jpg"')).to be_nil
     end
   end
 end

data/spec/unit/emoticon_spec.rb

@@ -7,127 +7,127 @@ describe Jpmobile::Emoticon do
   describe "unicodecr_to_external" do
     context "should convert unicodecr to docomo encoding" do
       it "when no options" do
-        Jpmobile::Emoticon::unicodecr_to_external("").should == sjis("\xf8\x9f")
+        expect(Jpmobile::Emoticon::unicodecr_to_external("")).to eq(sjis("\xf8\x9f"))
       end
 
       it "in multiple convertion" do
-        Jpmobile::Emoticon::unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_DOCOMO, true).should == sjis("\xf8\x9f\xf8\xa0")
+        expect(Jpmobile::Emoticon::unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_DOCOMO, true)).to eq(sjis("\xf8\x9f\xf8\xa0"))
       end
     end
 
     context "should convert unicodecr to au encoding" do
       it "when no options" do
-        Jpmobile::Emoticon::unicodecr_to_external("").should == sjis("\xf6\x59")
+        expect(Jpmobile::Emoticon::unicodecr_to_external("")).to eq(sjis("\xf6\x59"))
       end
     end
 
     context "should convert unicodecr to softbank encoding" do
       it "when no opptions" do
-        Jpmobile::Emoticon::unicodecr_to_external("").should == [0xe001].pack('U')
+        expect(Jpmobile::Emoticon::unicodecr_to_external("")).to eq([0xe001].pack('U'))
       end
 
       it "in multiple convertion" do
-        Jpmobile::Emoticon::unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK, true).should == [0xe04a, 0xe049].pack('U*')
+        expect(Jpmobile::Emoticon::unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK, true)).to eq([0xe04a, 0xe049].pack('U*'))
       end
     end
 
     it 'should convert docomo unicodecr to Unicode 6.0 emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == [0x2600].pack('U')
+      expect(Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false)).to eq([0x2600].pack('U'))
     end
 
     it 'should convert au unicodecr to Unicode 6.0 emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == [0x26C5].pack('U')
+      expect(Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false)).to eq([0x26C5].pack('U'))
     end
 
     it 'should convert Softbank unicodecr to Unicode 6.0 emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == [0x1F466].pack('U')
+      expect(Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false)).to eq([0x1F466].pack('U'))
     end
 
     it 'should not convert 〓' do
-      Jpmobile::Emoticon.unicodecr_to_external("〓", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == '〓'
+      expect(Jpmobile::Emoticon.unicodecr_to_external("〓", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false)).to eq('〓')
     end
 
     it 'should convert docomo unicodecr to Google emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == [0xFE000].pack('U')
+      expect(Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false)).to eq([0xFE000].pack('U'))
     end
 
     it 'should convert au unicodecr to Google emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == [0xFE00F].pack('U')
+      expect(Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false)).to eq([0xFE00F].pack('U'))
     end
 
     it 'should convert Softbank unicodecr to Google emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == [0xFE19B].pack('U')
+      expect(Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false)).to eq([0xFE19B].pack('U'))
     end
 
     it 'should not convert 〓' do
-      Jpmobile::Emoticon.unicodecr_to_external("〓", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == '〓'
+      expect(Jpmobile::Emoticon.unicodecr_to_external("〓", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false)).to eq('〓')
     end
   end
 
   describe "unicodecr_to_utf8" do
     it "should convert unicodecr to internal utf8 encoding" do
       # docomo codepoint
-      Jpmobile::Emoticon::unicodecr_to_utf8("").should == utf8("\356\230\276")
+      expect(Jpmobile::Emoticon::unicodecr_to_utf8("")).to eq(utf8("\356\230\276"))
       # au codepoint
-      Jpmobile::Emoticon::unicodecr_to_utf8("").should == utf8("\356\222\201")
+      expect(Jpmobile::Emoticon::unicodecr_to_utf8("")).to eq(utf8("\356\222\201"))
       # softbank codepoint
-      Jpmobile::Emoticon::unicodecr_to_utf8("").should == utf8("\xef\x80\x81")
+      expect(Jpmobile::Emoticon::unicodecr_to_utf8("")).to eq(utf8("\xef\x80\x81"))
     end
   end
 
   describe "utf8_to_unicodecr" do
     it "should convert utf8 encoding to unicodecr" do
       # docomo codepoint
-      Jpmobile::Emoticon::utf8_to_unicodecr(utf8("\356\230\276")).should == ""
+      expect(Jpmobile::Emoticon::utf8_to_unicodecr(utf8("\356\230\276"))).to eq("")
       # au codepoint
-      Jpmobile::Emoticon::utf8_to_unicodecr(utf8("\356\222\201")).should == ""
+      expect(Jpmobile::Emoticon::utf8_to_unicodecr(utf8("\356\222\201"))).to eq("")
       # softbank codepoint
-      Jpmobile::Emoticon::utf8_to_unicodecr(utf8("\xef\x80\x81")).should == ""
+      expect(Jpmobile::Emoticon::utf8_to_unicodecr(utf8("\xef\x80\x81"))).to eq("")
     end
   end
 
   describe "external_to_unicodecr" do
     it "should convert docomo encoding to unicodecr" do
-      Jpmobile::Emoticon::external_to_unicodecr_docomo(sjis("\xf8\x9f")).should == ""
+      expect(Jpmobile::Emoticon::external_to_unicodecr_docomo(sjis("\xf8\x9f"))).to eq("")
     end
 
     it "should convert au encoding to unicodecr" do
-      Jpmobile::Emoticon::external_to_unicodecr_au(sjis("\xf6\x59")).should == ""
+      expect(Jpmobile::Emoticon::external_to_unicodecr_au(sjis("\xf6\x59"))).to eq("")
     end
 
     it "should convert softbank encoding to unicodecr" do
-      Jpmobile::Emoticon::external_to_unicodecr_softbank([0xe001].pack('U')).should == ""
+      expect(Jpmobile::Emoticon::external_to_unicodecr_softbank([0xe001].pack('U'))).to eq("")
     end
 
     it "should not convert docomo encoding of koukai-sjis emoticons to unicodecr" do
-      Jpmobile::Emoticon::external_to_unicodecr_docomo(sjis("\x8c\xf6\x8a\x4a")).should == sjis("\x8c\xf6\x8a\x4a")
+      expect(Jpmobile::Emoticon::external_to_unicodecr_docomo(sjis("\x8c\xf6\x8a\x4a"))).to eq(sjis("\x8c\xf6\x8a\x4a"))
     end
 
     context 'at iPhone emoticon' do
       it 'should convert iPhone Unicode emoticon to SoftBank emoticon' do
-        Jpmobile::Emoticon::external_to_unicodecr_unicode60("\342\230\200").should == ""
+        expect(Jpmobile::Emoticon::external_to_unicodecr_unicode60("\342\230\200")).to eq("")
       end
 
       it 'should convert iPhone Unicode emoticon to multi SoftBank emoticons' do
-        Jpmobile::Emoticon::external_to_unicodecr_unicode60("\342\233\205").should == ","
+        expect(Jpmobile::Emoticon::external_to_unicodecr_unicode60("\342\233\205")).to eq(",")
       end
 
       it 'should not convert 〓' do
-        Jpmobile::Emoticon::external_to_unicodecr_unicode60('〓').should == "〓"
+        expect(Jpmobile::Emoticon::external_to_unicodecr_unicode60('〓')).to eq("〓")
       end
     end
 
     context 'at Android emoticon' do
       it 'should convert Android Google Unicode emoticon to Docomo emoticon' do
-        Jpmobile::Emoticon::external_to_unicodecr_google("\363\276\200\200").should == ""
+        expect(Jpmobile::Emoticon::external_to_unicodecr_google("\363\276\200\200")).to eq("")
       end
 
       it 'should convert Android Google Unicode emoticon to multi Docomo emoticon' do
-        Jpmobile::Emoticon::external_to_unicodecr_google("\363\276\200\217").should == ""
+        expect(Jpmobile::Emoticon::external_to_unicodecr_google("\363\276\200\217")).to eq("")
       end
 
       it 'should not convert 〓' do
-        Jpmobile::Emoticon::external_to_unicodecr_google('〓').should == "〓"
+        expect(Jpmobile::Emoticon::external_to_unicodecr_google('〓')).to eq("〓")
       end
     end
   end
@@ -135,19 +135,19 @@ describe Jpmobile::Emoticon do
   context "for email" do
     describe "au" do
       it "should not convert 助助 that does not contain emoticons" do
-        Jpmobile::Emoticon.external_to_unicodecr_au_mail(utf8_to_jis("助助")).should_not match(/e484/i)
+        expect(Jpmobile::Emoticon.external_to_unicodecr_au_mail(utf8_to_jis("助助"))).not_to match(/e484/i)
       end
 
       it "should not convert exterior of 2byte Kanji-code" do
-        Jpmobile::Emoticon.external_to_unicodecr_au_mail(utf8_to_jis("abcd=uしから=uずんば=u")).should_not match(/e484/i)
+        expect(Jpmobile::Emoticon.external_to_unicodecr_au_mail(utf8_to_jis("abcd=uしから=uずんば=u"))).not_to match(/e484/i)
       end
 
       it "should not convert ascii string to unicodecr" do
-        Jpmobile::Emoticon.external_to_unicodecr_au_mail(utf8_to_jis("-------=_NextPart_15793_72254_63179")).should_not match(/e5c2/i)
+        expect(Jpmobile::Emoticon.external_to_unicodecr_au_mail(utf8_to_jis("-------=_NextPart_15793_72254_63179"))).not_to match(/e5c2/i)
       end
 
       it "should not include extra JIS escape sequence between Kanji-code and emoticon" do
-        Jpmobile::Emoticon.unicodecr_to_au_email(utf8_to_jis("掲示板")).should == Jpmobile::Util.ascii_8bit("\x1b\x24\x42\x75\x3a\x37\x47\x3C\x28\x48\x44\x1b\x28\x42")
+        expect(Jpmobile::Emoticon.unicodecr_to_au_email(utf8_to_jis("掲示板"))).to eq(Jpmobile::Util.ascii_8bit("\x1b\x24\x42\x75\x3a\x37\x47\x3C\x28\x48\x44\x1b\x28\x42"))
       end
     end
   end