jpmobile 4.1.1 → 4.1.4

data/spec/rack/jpmobile/emoticon_spec.rb

@@ -30,23 +30,23 @@ describe "絵文字が" do
 
     it "docomo 絵文字が変換されないこと" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
-      response_body(response).should == @docomo_cr
+      expect(response_body(response)).to eq(@docomo_cr)
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
-      response_body(response).should == @docomo_utf8
+      expect(response_body(response)).to eq(@docomo_utf8)
     end
 
     it "au 絵文字が変換されないこと" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
-      response_body(response).should == @au_cr
+      expect(response_body(response)).to eq(@au_cr)
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
-      response_body(response).should == @au_utf8
+      expect(response_body(response)).to eq(@au_utf8)
     end
 
     it "softbank 絵文字が変換されないこと" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
-      response_body(response).should == @softbank_cr
+      expect(response_body(response)).to eq(@softbank_cr)
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
-      response_body(response).should == @softbank_utf8
+      expect(response_body(response)).to eq(@softbank_utf8)
     end
   end
 
@@ -69,43 +69,43 @@ describe "絵文字が" do
     end
 
     it "Jpmobile::Emoticon.pc_emoticon? がtrueになること" do
-      Jpmobile::Emoticon.pc_emoticon?.should be_truthy
+      expect(Jpmobile::Emoticon.pc_emoticon?).to be_truthy
     end
 
     it "docomo 絵文字が画像に変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
-      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
+      expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it "docomo 絵文字コードが画像に変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
-      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
+      expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it "au 絵文字が画像に変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
-      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
+      expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it "au 絵文字コードが画像に変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
-      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
+      expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it "softbank 絵文字が画像に変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
-      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
+      expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it "softbank 絵文字コードが画像に変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
-      response_body(response).should == "<img src=\"#{@path}/sun.gif\" alt=\"sun\" />"
+      expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
     end
 
     it "Content-Type が変換できないものである場合には変換しないこと" do
       @res = Rack::MockRequest.env_for("/", 'Content-Type' => 'image/jpeg')
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
-      response_body(response).should == @softbank_utf8
+      expect(response_body(response)).to eq(@softbank_utf8)
     end
   end
 
@@ -119,26 +119,26 @@ describe "絵文字が" do
 
     it "docomo 絵文字が変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
-      response_body(response).should == sjis("\xf8\x9f")
+      expect(response_body(response)).to eq(sjis("\xf8\x9f"))
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
-      response_body(response).should == sjis("\xf8\x9f")
+      expect(response_body(response)).to eq(sjis("\xf8\x9f"))
 
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
-      response_body(response).should == sjis("\xf9\x79")
+      expect(response_body(response)).to eq(sjis("\xf9\x79"))
     end
 
     it "au 絵文字が変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
-      response_body(response).should == sjis("\xf8\x9f")
+      expect(response_body(response)).to eq(sjis("\xf8\x9f"))
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
-      response_body(response).should == sjis("\xf8\x9f")
+      expect(response_body(response)).to eq(sjis("\xf8\x9f"))
     end
 
     it "softbank 絵文字が変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
-      response_body(response).should == sjis("\xf8\x9f")
+      expect(response_body(response)).to eq(sjis("\xf8\x9f"))
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
-      response_body(response).should == sjis("\xf8\x9f")
+      expect(response_body(response)).to eq(sjis("\xf8\x9f"))
     end
 
     it "パラメータが変換されること" do
@@ -151,8 +151,8 @@ describe "絵文字が" do
         'Content-Type' => 'text/html; charset=utf-8')
       res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
       req = Rack::Request.new(res[1])
-      req.params['q'].should == utf8("\xee\x98\xbe")
-      response_body(res).should == sjis("\xf8\x9f")
+      expect(req.params['q']).to eq(utf8("\xee\x98\xbe"))
+      expect(response_body(res)).to eq(sjis("\xf8\x9f"))
     end
   end
 
@@ -166,26 +166,26 @@ describe "絵文字が" do
 
     it "docomo 絵文字が変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
-      response_body(response).should == sjis("\xf6\x60")
+      expect(response_body(response)).to eq(sjis("\xf6\x60"))
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
-      response_body(response).should == sjis("\xf6\x60")
+      expect(response_body(response)).to eq(sjis("\xf6\x60"))
 
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
-      response_body(response).should == utf8_to_sjis("［ドコモポイント］")
+      expect(response_body(response)).to eq(utf8_to_sjis("［ドコモポイント］"))
     end
 
     it "au 絵文字が変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
-      response_body(response).should == sjis("\xf6\x60")
+      expect(response_body(response)).to eq(sjis("\xf6\x60"))
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
-      response_body(response).should == sjis("\xf6\x60")
+      expect(response_body(response)).to eq(sjis("\xf6\x60"))
     end
 
     it "softbank 絵文字が変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
-      response_body(response).should == sjis("\xf6\x60")
+      expect(response_body(response)).to eq(sjis("\xf6\x60"))
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
-      response_body(response).should == sjis("\xf6\x60")
+      expect(response_body(response)).to eq(sjis("\xf6\x60"))
     end
 
     it "パラメータが変換されること" do
@@ -198,8 +198,8 @@ describe "絵文字が" do
         'Content-Type' => 'text/html; charset=utf-8')
       res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
       req = Rack::Request.new(res[1])
-      req.params['q'].should == [0xe488].pack("U")
-      response_body(res).should == sjis("\xf6\x60")
+      expect(req.params['q']).to eq([0xe488].pack("U"))
+      expect(response_body(res)).to eq(sjis("\xf6\x60"))
     end
   end
 
@@ -213,26 +213,26 @@ describe "絵文字が" do
 
     it "docomo 絵文字が変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
-      response_body(response).should == [0xe04a].pack('U')
+      expect(response_body(response)).to eq([0xe04a].pack('U'))
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
-      response_body(response).should == [0xe04a].pack('U')
+      expect(response_body(response)).to eq([0xe04a].pack('U'))
 
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
-      response_body(response).should == "［ドコモポイント］"
+      expect(response_body(response)).to eq("［ドコモポイント］")
     end
 
     it "au 絵文字が変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
-      response_body(response).should == [0xe04a].pack('U')
+      expect(response_body(response)).to eq([0xe04a].pack('U'))
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
-      response_body(response).should == [0xe04a].pack('U')
+      expect(response_body(response)).to eq([0xe04a].pack('U'))
     end
 
     it "softbank 絵文字が変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
-      response_body(response).should == [0xe04a].pack('U')
+      expect(response_body(response)).to eq([0xe04a].pack('U'))
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
-      response_body(response).should == [0xe04a].pack('U')
+      expect(response_body(response)).to eq([0xe04a].pack('U'))
     end
 
     it "パラメータが変換されること" do
@@ -245,8 +245,8 @@ describe "絵文字が" do
         'Content-Type' => 'text/html; charset=utf-8')
       res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
       req = Rack::Request.new(res[1])
-      req.params['q'].should == [0xf04a].pack("U")
-      response_body(res).should == [0xe04a].pack('U')
+      expect(req.params['q']).to eq([0xf04a].pack("U"))
+      expect(response_body(res)).to eq([0xe04a].pack('U'))
     end
   end
 
@@ -260,9 +260,9 @@ describe "絵文字が" do
 
     it "softbank 絵文字が変換されること" do
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
-      response_body(response).should == [0xe04a].pack('U')
+      expect(response_body(response)).to eq([0xe04a].pack('U'))
       response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
-      response_body(response).should == [0xe04a].pack('U')
+      expect(response_body(response)).to eq([0xe04a].pack('U'))
     end
 
     it "パラメータが変換されること" do
@@ -275,8 +275,8 @@ describe "絵文字が" do
         'Content-Type' => 'text/html; charset=utf-8')
       res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
       req = Rack::Request.new(res[1])
-      req.params['q'].should == [0xf04a].pack("U")
-      response_body(res).should == [0xe04a].pack('U')
+      expect(req.params['q']).to eq([0xf04a].pack("U"))
+      expect(response_body(res)).to eq([0xe04a].pack('U'))
     end
   end
 
@@ -291,9 +291,9 @@ describe "絵文字が" do
 
       it 'should convert Softbank emoticon' do
         response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
-        response_body(response).should == [0xe04a].pack('U')
+        expect(response_body(response)).to eq([0xe04a].pack('U'))
         response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
-        response_body(response).should == [0xe04a].pack('U')
+        expect(response_body(response)).to eq([0xe04a].pack('U'))
       end
 
       it "converts query parameters" do
@@ -306,13 +306,13 @@ describe "絵文字が" do
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
         req = Rack::Request.new(res[1])
-        req.params['q'].should == [0xf04a].pack("U")
-        response_body(res).should == [0xe04a].pack('U')
+        expect(req.params['q']).to eq([0xf04a].pack("U"))
+        expect(response_body(res)).to eq([0xe04a].pack('U'))
       end
 
       it 'should not convert 〓' do
         response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
-        response_body(response).should == '〓'
+        expect(response_body(response)).to eq('〓')
       end
     end
 
@@ -328,9 +328,9 @@ describe "絵文字が" do
 
       it "should convert Unicode emoticon" do
         response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@unicode_single))).call(@res)[2]
-        response_body(response).should == [0x2600].pack('U*')
+        expect(response_body(response)).to eq([0x2600].pack('U*'))
         response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@unicode_multi))).call(@res)[2]
-        response_body(response).should == [0x26C5].pack('U*')
+        expect(response_body(response)).to eq([0x26C5].pack('U*'))
       end
 
       it "converts query parameters" do
@@ -343,13 +343,13 @@ describe "絵文字が" do
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
         req = Rack::Request.new(res[1])
-        req.params['q'].should == [0x26C5].pack("U")
-        response_body(res).should == [0x26C5].pack('U')
+        expect(req.params['q']).to eq([0x26C5].pack("U"))
+        expect(response_body(res)).to eq([0x26C5].pack('U'))
       end
 
       it 'should not convert 〓' do
         response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
-        response_body(response).should == '〓'
+        expect(response_body(response)).to eq('〓')
       end
     end
   end
@@ -370,9 +370,9 @@ describe "絵文字が" do
 
       it "should convert Google emoticon" do
         response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
-        response_body(response).should == [0xFE000].pack('U*')
+        expect(response_body(response)).to eq([0xFE000].pack('U*'))
         response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
-        response_body(response).should == [0xFE00F].pack('U*')
+        expect(response_body(response)).to eq([0xFE00F].pack('U*'))
       end
 
       it "converts query parameters irreversibly" do
@@ -385,13 +385,13 @@ describe "絵文字が" do
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
         req = Rack::Request.new(res[1])
-        req.params['q'].should == [0xe63e, 0xe63f].pack("U*")
-        response_body(res).should == [0xfe000, 0xfe001].pack("U*")
+        expect(req.params['q']).to eq([0xe63e, 0xe63f].pack("U*"))
+        expect(response_body(res)).to eq([0xfe000, 0xfe001].pack("U*"))
       end
 
       it 'should not convert 〓' do
         response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
-        response_body(response).should == '〓'
+        expect(response_body(response)).to eq('〓')
       end
     end
 
@@ -405,9 +405,9 @@ describe "絵文字が" do
 
       it "should convert Google emoticon" do
         response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
-        response_body(response).should == [0xFE000].pack('U*')
+        expect(response_body(response)).to eq([0xFE000].pack('U*'))
         response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
-        response_body(response).should == [0xFE00F].pack('U*')
+        expect(response_body(response)).to eq([0xFE00F].pack('U*'))
       end
 
       it "converts query parameters irreversibly" do
@@ -420,13 +420,13 @@ describe "絵文字が" do
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
         req = Rack::Request.new(res[1])
-        req.params['q'].should == [0xe63e, 0xe63f].pack("U*")
-        response_body(res).should == [0xfe000, 0xfe001].pack("U*")
+        expect(req.params['q']).to eq([0xe63e, 0xe63f].pack("U*"))
+        expect(response_body(res)).to eq([0xfe000, 0xfe001].pack("U*"))
       end
 
       it 'should not convert 〓' do
         response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
-        response_body(response).should == '〓'
+        expect(response_body(response)).to eq('〓')
       end
 
       it 'should convert unsupported emoticon to "〓"' do
@@ -439,8 +439,8 @@ describe "絵文字が" do
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
         req = Rack::Request.new(res[1])
-        req.params['q'].should == '〓'
-        response_body(res).should == '〓'
+        expect(req.params['q']).to eq('〓')
+        expect(response_body(res)).to eq('〓')
       end
     end
   end

data/spec/rack/jpmobile/filter_spec.rb

@@ -19,8 +19,8 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
-        res[1]['Content-Type'].should == "text/html; charset=Shift_JIS"
-        response_body(res).should == @sjis
+        expect(res[1]['Content-Type']).to eq("text/html; charset=Shift_JIS")
+        expect(response_body(res)).to eq(@sjis)
       end
 
       context "Content-Type" do
@@ -31,8 +31,8 @@ describe Jpmobile::Rack::Filter do
             'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
             'Content-Type' => 'application/xhtml+xml; charset=utf-8')
           res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
-          res[1]['Content-Type'].should == "application/xhtml+xml; charset=Shift_JIS"
-          response_body(res).should == @sjis
+          expect(res[1]['Content-Type']).to eq("application/xhtml+xml; charset=Shift_JIS")
+          expect(response_body(res)).to eq(@sjis)
         end
 
         it "が application/xml のときに変換されないこと" do
@@ -42,8 +42,8 @@ describe Jpmobile::Rack::Filter do
             'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
             'Content-Type' => 'application/xml; charset=utf-8')
           res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
-          res[1]['Content-Type'].should == "application/xml; charset=utf-8"
-          response_body(res).should == @utf8
+          expect(res[1]['Content-Type']).to eq("application/xml; charset=utf-8")
+          expect(response_body(res)).to eq(@utf8)
         end
 
         it "が image/jpeg のときに変換されないこと" do
@@ -53,8 +53,8 @@ describe Jpmobile::Rack::Filter do
             'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
             'Content-Type' => 'image/jpeg')
           res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
-          res[1]['Content-Type'].should == "image/jpeg"
-          response_body(res).should == @utf8
+          expect(res[1]['Content-Type']).to eq("image/jpeg")
+          expect(response_body(res)).to eq(@utf8)
         end
 
         it "が application/octet-stream のときに変換されないこと" do
@@ -64,8 +64,8 @@ describe Jpmobile::Rack::Filter do
             'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
             'Content-Type' => 'application/octet-stream')
           res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
-          res[1]['Content-Type'].should == "application/octet-stream"
-          response_body(res).should == @utf8
+          expect(res[1]['Content-Type']).to eq("application/octet-stream")
+          expect(response_body(res)).to eq(@utf8)
         end
 
         it "が video/mpeg のときに変換されないこと" do
@@ -75,8 +75,8 @@ describe Jpmobile::Rack::Filter do
             'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
             'Content-Type' => 'video/mpeg')
           res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
-          res[1]['Content-Type'].should == "video/mpeg"
-          response_body(res).should == @utf8
+          expect(res[1]['Content-Type']).to eq("video/mpeg")
+          expect(response_body(res)).to eq(@utf8)
         end
       end
     end
@@ -89,8 +89,8 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
-        res[1]['Content-Type'].should == "text/html; charset=Shift_JIS"
-        response_body(res).should == @sjis
+        expect(res[1]['Content-Type']).to eq("text/html; charset=Shift_JIS")
+        expect(response_body(res)).to eq(@sjis)
       end
     end
 
@@ -102,8 +102,8 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1",
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
-        res[1]['Content-Type'].should == "text/html; charset=utf-8"
-        response_body(res).should == @utf8
+        expect(res[1]['Content-Type']).to eq("text/html; charset=utf-8")
+        expect(response_body(res)).to eq(@utf8)
       end
     end
 
@@ -114,12 +114,12 @@ describe Jpmobile::Rack::Filter do
         'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
         'Content-Type' => 'text/html; charset=utf-8')
       res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('<input name="utf8" type="hidden" value="&#x2713;" />'))).call(req)
-      res[1]['Content-Type'].should == "text/html; charset=Shift_JIS"
-      response_body(res).should == " "
+      expect(res[1]['Content-Type']).to eq("text/html; charset=Shift_JIS")
+      expect(response_body(res)).to eq(" ")
 
       res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('<input name="utf8" type="hidden" value="&#x2713;">'))).call(req)
-      res[1]['Content-Type'].should == "text/html; charset=Shift_JIS"
-      response_body(res).should == " "
+      expect(res[1]['Content-Type']).to eq("text/html; charset=Shift_JIS")
+      expect(response_body(res)).to eq(" ")
     end
 
     it "Nokogiri 経由の _snowman が出力されないこと" do
@@ -129,12 +129,12 @@ describe Jpmobile::Rack::Filter do
         'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
         'Content-Type' => 'text/html; charset=utf-8')
       res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new("<input name=\"utf8\" type=\"hidden\" value=\"#{[10003].pack("U")}\" />"))).call(req)
-      res[1]['Content-Type'].should == "text/html; charset=Shift_JIS"
-      response_body(res).should == " "
+      expect(res[1]['Content-Type']).to eq("text/html; charset=Shift_JIS")
+      expect(response_body(res)).to eq(" ")
 
       res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new("<input name=\"utf8\" type=\"hidden\" value=\"#{[10003].pack("U")}\">"))).call(req)
-      res[1]['Content-Type'].should == "text/html; charset=Shift_JIS"
-      response_body(res).should == " "
+      expect(res[1]['Content-Type']).to eq("text/html; charset=Shift_JIS")
+      expect(response_body(res)).to eq(" ")
     end
   end
 
@@ -162,7 +162,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_cr))).call(res)
-        response_body(res).should == @sjis + @docomo_emoji
+        expect(response_body(res)).to eq(@sjis + @docomo_emoji)
       end
 
       it "docomo のUTF-8絵文字が変換されること" do
@@ -172,7 +172,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_utf8))).call(res)
-        response_body(res).should == @sjis + @docomo_emoji
+        expect(response_body(res)).to eq(@sjis + @docomo_emoji)
       end
 
       it "au のUTF-8絵文字が変換されること" do
@@ -182,7 +182,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_utf8))).call(res)
-        response_body(res).should == @sjis + @docomo_emoji
+        expect(response_body(res)).to eq(@sjis + @docomo_emoji)
       end
 
       it "softbank のUTF-8絵文字が変換されること" do
@@ -192,7 +192,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_utf8))).call(res)
-        response_body(res).should == @sjis + @docomo_emoji
+        expect(response_body(res)).to eq(@sjis + @docomo_emoji)
       end
     end
 
@@ -204,7 +204,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_cr))).call(res)
-        response_body(res).should == @sjis + @au_emoji
+        expect(response_body(res)).to eq(@sjis + @au_emoji)
       end
 
       it "docomo のUTF-8絵文字が変換されること" do
@@ -214,7 +214,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_utf8))).call(res)
-        response_body(res).should == @sjis + @au_emoji
+        expect(response_body(res)).to eq(@sjis + @au_emoji)
       end
 
       it "au のUTF-8絵文字が変換されること" do
@@ -224,7 +224,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_utf8))).call(res)
-        response_body(res).should == @sjis + @au_emoji
+        expect(response_body(res)).to eq(@sjis + @au_emoji)
       end
 
       it "softbank のUTF-8絵文字が変換されること" do
@@ -234,7 +234,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_utf8))).call(res)
-        response_body(res).should == @sjis + @au_emoji
+        expect(response_body(res)).to eq(@sjis + @au_emoji)
       end
     end
 
@@ -246,7 +246,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1",
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_cr))).call(res)
-        response_body(res).should == @utf8 + @softbank_emoji
+        expect(response_body(res)).to eq(@utf8 + @softbank_emoji)
       end
 
       it "docomo のUTF-8絵文字が変換されること" do
@@ -256,7 +256,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1",
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_utf8))).call(res)
-        response_body(res).should == @utf8 + @softbank_emoji
+        expect(response_body(res)).to eq(@utf8 + @softbank_emoji)
       end
 
       it "au のUTF-8絵文字が変換されること" do
@@ -266,7 +266,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1",
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_utf8))).call(res)
-        response_body(res).should == @utf8 + @softbank_emoji
+        expect(response_body(res)).to eq(@utf8 + @softbank_emoji)
       end
 
       it "softbank のUTF-8絵文字が変換されること" do
@@ -276,7 +276,7 @@ describe Jpmobile::Rack::Filter do
           'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1",
           'Content-Type' => 'text/html; charset=utf-8')
         res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_utf8))).call(res)
-        response_body(res).should == @utf8 + @softbank_emoji
+        expect(response_body(res)).to eq(@utf8 + @softbank_emoji)
       end
     end
   end

data/spec/rack/jpmobile/iphone_spec.rb

@@ -11,10 +11,10 @@ describe Jpmobile::Rack::MobileCarrier, "iphone" do
         'HTTP_USER_AGENT' => 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; ja-jp) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7A341 Safari/528.16')
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].class.should            == Jpmobile::Mobile::Iphone
-      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::Iphone)
+      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
 
@@ -26,7 +26,7 @@ describe Jpmobile::Rack::MobileCarrier, "iphone" do
         "REMOTE_ADDR"=>"202.179.204.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/mobile_by_ua_spec.rb

@@ -29,7 +29,7 @@ describe Jpmobile::Rack::MobileCarrier do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => user_agent)
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
-      env['rack.jpmobile'].class.should == carrier
+      expect(env['rack.jpmobile'].class).to eq(carrier)
     end
   end
 
@@ -38,6 +38,6 @@ describe Jpmobile::Rack::MobileCarrier do
       'http://jpmobile-rails.org/',
       'HTTP_USER_AGENT' => 'Googlebot')
     env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
-    env['rack.jpmobile'].should be_nil
+    expect(env['rack.jpmobile']).to be_nil
   end
 end