jpmobile 4.1.1 → 4.1.4

data/spec/unit/variants_spec.rb

@@ -7,11 +7,17 @@ describe Jpmobile::Mobile::AbstractMobile do
   subject{ Jpmobile::Mobile::AbstractMobile.new(nil, nil) }
 
   describe '#variants' do
-    its(:variants){ should === ['mobile'] }
+    describe '#variants' do
+      subject { super().variants }
+      it { is_expected.to be === ['mobile'] }
+    end
   end
 
   describe '#mail_variants' do
-    its(:mail_variants){ should == [] }
+    describe '#mail_variants' do
+      subject { super().mail_variants }
+      it { is_expected.to eq([]) }
+    end
   end
 end
 
@@ -19,7 +25,10 @@ describe Jpmobile::Mobile::Docomo do
   subject{ Jpmobile::Mobile::Docomo.new(nil, nil) }
 
   describe '#variants' do
-    its(:variants){ should == ['mobile_docomo', 'mobile'] }
+    describe '#variants' do
+      subject { super().variants }
+      it { is_expected.to eq(['mobile_docomo', 'mobile']) }
+    end
   end
 
   describe '#mail_variants' do
@@ -33,7 +42,10 @@ describe Jpmobile::Mobile::Au do
   subject{ Jpmobile::Mobile::Au.new(nil, nil) }
 
   describe '#variants' do
-    its(:variants){ should == ['mobile_au', 'mobile'] }
+    describe '#variants' do
+      subject { super().variants }
+      it { is_expected.to eq(['mobile_au', 'mobile']) }
+    end
   end
 
   describe '#mail_variants' do
@@ -47,7 +59,10 @@ describe Jpmobile::Mobile::Softbank do
   subject{ Jpmobile::Mobile::Softbank.new(nil, nil) }
 
   describe '#variants' do
-    its(:variants){ should == ['mobile_softbank', 'mobile'] }
+    describe '#variants' do
+      subject { super().variants }
+      it { is_expected.to eq(['mobile_softbank', 'mobile']) }
+    end
   end
 
   describe '#mail_variants' do
@@ -61,7 +76,10 @@ describe Jpmobile::Mobile::Android do
   subject{ Jpmobile::Mobile::Android.new(nil, nil) }
 
   describe '#variants' do
-    its(:variants){ should == ['smart_phone_android', 'smart_phone'] }
+    describe '#variants' do
+      subject { super().variants }
+      it { is_expected.to eq(['smart_phone_android', 'smart_phone']) }
+    end
   end
 
   describe '#mail_variants' do
@@ -75,7 +93,10 @@ describe Jpmobile::Mobile::AndroidTablet do
   subject{ Jpmobile::Mobile::AndroidTablet.new(nil, nil) }
 
   describe '#variants' do
-    its(:variants){ should == ['tablet_android_tablet', 'tablet', 'smart_phone'] }
+    describe '#variants' do
+      subject { super().variants }
+      it { is_expected.to eq(['tablet_android_tablet', 'tablet', 'smart_phone']) }
+    end
   end
 
   describe '#mail_variants' do
@@ -89,7 +110,10 @@ describe Jpmobile::Mobile::Iphone do
   subject{ Jpmobile::Mobile::Iphone.new(nil, nil) }
 
   describe '#variants' do
-    its(:variants) { should == ['smart_phone_iphone', 'smart_phone'] }
+    describe '#variants' do
+      subject { super().variants }
+      it { is_expected.to eq(['smart_phone_iphone', 'smart_phone']) }
+    end
   end
 
   describe '#mail_variants' do
@@ -103,7 +127,10 @@ describe Jpmobile::Mobile::Ipad do
   subject{ Jpmobile::Mobile::Ipad.new(nil, nil) }
 
   describe '#variants' do
-    its(:variants){ should == ['tablet_ipad', 'tablet', 'smart_phone'] }
+    describe '#variants' do
+      subject { super().variants }
+      it { is_expected.to eq(['tablet_ipad', 'tablet', 'smart_phone']) }
+    end
   end
 
   describe '#mail_variants' do
@@ -117,7 +144,10 @@ describe Jpmobile::Mobile::WindowsPhone do
   subject{ Jpmobile::Mobile::WindowsPhone.new(nil, nil) }
 
   describe '#variants' do
-    its(:variants){ should == ['smart_phone_windows_phone', 'smart_phone'] }
+    describe '#variants' do
+      subject { super().variants }
+      it { is_expected.to eq(['smart_phone_windows_phone', 'smart_phone']) }
+    end
   end
 
   describe '#mail_variants' do

data/test/rails/overrides/Gemfile

@@ -40,9 +40,9 @@ gem 'spring',        group: :development
 
 gem 'geokit'
 
-gem 'jpmobile',             :path => '../../../'
-gem 'jpmobile-terminfo',    :path => '../../../vendor/jpmobile-terminfo'
-gem 'jpmobile-ipaddresses', :path => '../../../vendor/jpmobile-ipaddresses'
+gem 'jpmobile',             path: './vendor/jpmobile'
+gem 'jpmobile-terminfo',    path: './vendor/jpmobile-terminfo'
+gem 'jpmobile-ipaddresses', path: './vendor/jpmobile-ipaddresses'
 
 gem 'activerecord-session_store'
 

data/test/rails/overrides/spec/controllers/docomo_guid_spec.rb

@@ -19,7 +19,7 @@ shared_examples_for "docomo_guid が起動するとき" do
   end
 end
 
-describe DocomoGuidBaseController do
+describe DocomoGuidBaseController, :type => :controller do
   before(:each) do
     request.user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
   end
@@ -27,12 +27,12 @@ describe DocomoGuidBaseController do
   it "の docomo_guid_mode は nil" do
     get :link
 
-    controller.docomo_guid_mode.should be_nil
+    expect(controller.docomo_guid_mode).to be_nil
   end
   it_should_behave_like "docomo_guid が起動しないとき"
 end
 
-describe DocomoGuidAlwaysController do
+describe DocomoGuidAlwaysController, :type => :controller do
   before(:each) do
     request.user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
   end
@@ -40,12 +40,12 @@ describe DocomoGuidAlwaysController do
   it "の docomo_guid_always は :always" do
     get :link
 
-    controller.docomo_guid_mode.should == :always
+    expect(controller.docomo_guid_mode).to eq(:always)
   end
   it_should_behave_like "docomo_guid が起動するとき"
 end
 
-describe DocomoGuidDocomoController do
+describe DocomoGuidDocomoController, :type => :controller do
   before(:each) do
     request.user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
   end
@@ -53,7 +53,7 @@ describe DocomoGuidDocomoController do
   it "の docomo_guid_mode は :docomo" do
     get :link
 
-    controller.docomo_guid_mode.should == :docomo
+    expect(controller.docomo_guid_mode).to eq(:docomo)
   end
 
   shared_examples_for 'describe_mobile_with_ua' do |user_agent, example_name|

data/test/rails/overrides/spec/controllers/helpers_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe LinksController do
+describe LinksController, :type => :controller do
   render_views
 
   # 文字列 +str+ 中に含まれるリンクについて、
@@ -18,9 +18,9 @@ describe LinksController do
 
   it "get_position_link_to_がエラー無く終わるか" do
     request.user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
-    lambda {
+    expect {
       get :show_all
-    }.should_not raise_error
+    }.not_to raise_error
   end
 
   context "docomo で" do
@@ -29,11 +29,11 @@ describe LinksController do
       get :link
       links = get_href_and_texts(response.body)
 
-      links.size.should == 1
+      expect(links.size).to eq(1)
       text, attrs, path, params = links.first
-      text.should == "STRING"
-      path.should == "http://test.host/links/link"
-      response.body.should =~ /lcs>/
+      expect(text).to eq("STRING")
+      expect(path).to eq("http://test.host/links/link")
+      expect(response.body).to match(/lcs>/)
     end
 
     it "docomo_utn_link_to が正しく出力されること" do
@@ -41,11 +41,11 @@ describe LinksController do
       get :docomo_utn
       links = get_href_and_texts(response.body)
 
-      links.size.should == 1
+      expect(links.size).to eq(1)
       text, attrs, path, params = links.first
-      text.should == "STRING"
-      path.should == "http://test.host/links/docomo_utn"
-      response.body.should =~ /utn>/
+      expect(text).to eq("STRING")
+      expect(path).to eq("http://test.host/links/docomo_utn")
+      expect(response.body).to match(/utn>/)
     end
 
     it "オープンiエリア取得用のリンクが正しく出力されること" do
@@ -53,14 +53,14 @@ describe LinksController do
       get :docomo_openiarea
       links = get_href_and_texts(response.body)
 
-      links.size.should == 1
+      expect(links.size).to eq(1)
       text, attrs, path, params = links.first
-      text.should == "STRING"
-      path.should == "http://w1m.docomo.ne.jp/cp/iarea"
-      params["ecode"].should   == "OPENAREACODE"
-      params["msn"].should     == "OPENAREAKEY"
-      params["posinfo"].should == "1"
-      params["nl"].should      == "http://test.host/links/docomo_openiarea"
+      expect(text).to eq("STRING")
+      expect(path).to eq("http://w1m.docomo.ne.jp/cp/iarea")
+      expect(params["ecode"]).to   eq("OPENAREACODE")
+      expect(params["msn"]).to     eq("OPENAREAKEY")
+      expect(params["posinfo"]).to eq("1")
+      expect(params["nl"]).to      eq("http://test.host/links/docomo_openiarea")
     end
 
     it "GPS取得用のリンクが正しく出力されること" do
@@ -68,11 +68,11 @@ describe LinksController do
       get :docomo_foma_gps
       links = get_href_and_texts(response.body)
 
-      links.size.should == 1
+      expect(links.size).to eq(1)
       text, attrs, path, params = links.first
-      text.should == "STRING"
-      path.should == "http://test.host/links/docomo_foma_gps"
-      response.body.should =~ /lcs>/
+      expect(text).to eq("STRING")
+      expect(path).to eq("http://test.host/links/docomo_foma_gps")
+      expect(response.body).to match(/lcs>/)
     end
   end
 

data/test/rails/overrides/spec/controllers/mobile_spec_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe MobileSpecController do
+describe MobileSpecController, :type => :controller do
   render_views
 
   describe "GET 'index'" do
@@ -9,9 +9,9 @@ describe MobileSpecController do
         request.user_agent = 'Mozilla'
         get 'index'
 
-        response.should be_success
-        response.should render_template('index')
-        request.mobile?.should be_falsey
+        expect(response).to be_success
+        expect(response).to render_template('index')
+        expect(request.mobile?).to be_falsey
       end
     end
 
@@ -19,10 +19,10 @@ describe MobileSpecController do
       it "should be successful" do
         request.user_agent = "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
         get 'index'
-        response.should be_success
-        response.should render_template('index_mobile')
-        request.mobile?.should be_truthy
-        request.mobile.should be_a(Jpmobile::Mobile::Docomo)
+        expect(response).to be_success
+        expect(response).to render_template('index_mobile')
+        expect(request.mobile?).to be_truthy
+        expect(request.mobile).to be_a(Jpmobile::Mobile::Docomo)
       end
     end
   end
@@ -33,9 +33,9 @@ describe MobileSpecController do
         request.user_agent = 'Mozilla'
         get 'file_render'
 
-        response.should be_success
-        response.body.should match('The change you wanted was rejected')
-        request.mobile?.should be_falsey
+        expect(response).to be_success
+        expect(response.body).to match('The change you wanted was rejected')
+        expect(request.mobile?).to be_falsey
       end
     end
 
@@ -44,10 +44,10 @@ describe MobileSpecController do
         request.user_agent = "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
         get 'file_render'
 
-        response.should be_success
-        response.body.should match('The change you wanted was rejected')
-        request.mobile?.should be_truthy
-        request.mobile.should be_a(Jpmobile::Mobile::Docomo)
+        expect(response).to be_success
+        expect(response.body).to match('The change you wanted was rejected')
+        expect(request.mobile?).to be_truthy
+        expect(request.mobile).to be_a(Jpmobile::Mobile::Docomo)
       end
     end
   end
@@ -67,8 +67,8 @@ describe MobileSpecController do
         request.user_agent = 'Mozilla'
         get 'no_mobile'
 
-        response.should be_success
-        response.body.should_not match('RailsRoot PC mobile')
+        expect(response).to be_success
+        expect(response.body).not_to match('RailsRoot PC mobile')
       end
     end
 
@@ -77,8 +77,8 @@ describe MobileSpecController do
         request.user_agent = "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
         get 'no_mobile'
 
-        response.should be_success
-        response.body.should_not match('RailsRoot mobile')
+        expect(response).to be_success
+        expect(response.body).not_to match('RailsRoot mobile')
       end
     end
   end

data/test/rails/overrides/spec/controllers/template_path_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe TemplatePathController do
+describe TemplatePathController, :type => :controller do
   before do
     request.user_agent = user_agent
   end
@@ -13,7 +13,7 @@ describe TemplatePathController do
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      controller.lookup_context.mobile.should == [ 'mobile_docomo', 'mobile' ]
+      expect(controller.lookup_context.mobile).to eq([ 'mobile_docomo', 'mobile' ])
     end
   end
 
@@ -24,7 +24,7 @@ describe TemplatePathController do
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      controller.lookup_context.mobile.should == [ 'mobile_au', 'mobile' ]
+      expect(controller.lookup_context.mobile).to eq([ 'mobile_au', 'mobile' ])
     end
   end
 
@@ -35,7 +35,7 @@ describe TemplatePathController do
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      controller.lookup_context.mobile.should == [ 'mobile_vodafone', 'mobile_softbank', 'mobile' ]
+      expect(controller.lookup_context.mobile).to eq([ 'mobile_vodafone', 'mobile_softbank', 'mobile' ])
     end
   end
 
@@ -46,7 +46,7 @@ describe TemplatePathController do
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      controller.lookup_context.mobile.should == [ 'mobile_softbank', 'mobile' ]
+      expect(controller.lookup_context.mobile).to eq([ 'mobile_softbank', 'mobile' ])
     end
   end
 
@@ -57,7 +57,7 @@ describe TemplatePathController do
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      controller.lookup_context.mobile.should == [ 'smart_phone_iphone', 'smart_phone' ]
+      expect(controller.lookup_context.mobile).to eq([ 'smart_phone_iphone', 'smart_phone' ])
     end
   end
 
@@ -68,7 +68,7 @@ describe TemplatePathController do
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      controller.lookup_context.mobile.should == [ 'smart_phone_android', 'smart_phone' ]
+      expect(controller.lookup_context.mobile).to eq([ 'smart_phone_android', 'smart_phone' ])
     end
   end
 
@@ -79,7 +79,7 @@ describe TemplatePathController do
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      controller.lookup_context.mobile.should == [ 'smart_phone_windows_phone', 'smart_phone' ]
+      expect(controller.lookup_context.mobile).to eq([ 'smart_phone_windows_phone', 'smart_phone' ])
     end
   end
 end

data/test/rails/overrides/spec/controllers/trans_sid_controller_spec.rb

@@ -1,10 +1,10 @@
 require 'rails_helper'
 
-describe TransSidAlwaysController do
+describe TransSidAlwaysController, :type => :controller do
   describe "GET 'redirect_action'" do
     it "redirects 'form'" do
       get :redirect_action
-      response.should redirect_to(:action => 'form')
+      expect(response).to redirect_to(:action => 'form')
     end
   end
 end

data/test/rails/overrides/spec/features/admin/top_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe Admin::TopController do
+describe Admin::TopController, :type => :feature do
   describe "GET 'full_path'" do
     before do
       page.driver.header('user_agent', user_agent)
@@ -13,7 +13,7 @@ describe Admin::TopController do
       it '_partial.html.erbが使用されること' do
         visit '/admin/top/full_path'
 
-        page.should have_content("_partial.html.erb")
+        expect(page).to have_content("_partial.html.erb")
       end
     end
 
@@ -24,7 +24,7 @@ describe Admin::TopController do
       it '_partial_mobile_docomo.html.erbが使用されること' do
         visit '/admin/top/full_path'
 
-        page.should have_content("_partial_mobile_docomo.html.erb")
+        expect(page).to have_content("_partial_mobile_docomo.html.erb")
       end
     end
   end

data/test/rails/overrides/spec/features/filter_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "jpmobile integration spec" do
+describe "jpmobile integration spec", :type => :feature do
   include Jpmobile::Util
 
   before do
@@ -10,65 +10,65 @@ describe "jpmobile integration spec" do
   shared_examples_for "hankaku_filter :input => true のとき" do
     it "はtextareaの中では半角に変換されないこと" do
       visit "/#{controller}/textarea"
-      page.body.encode('UTF-8').should have_content('アブラカダブラ')
+      expect(page.body.encode('UTF-8')).to have_content('アブラカダブラ')
     end
     it "はinputのvalueの中では半角に変換されないこと" do
       visit "/#{controller}/input_tag"
-      page.body.encode('UTF-8').should have_css('input[value="アブラカダブラ"]')
+      expect(page.body.encode('UTF-8')).to have_css('input[value="アブラカダブラ"]')
     end
     it "は 変換されない" do
       visit "/#{controller}/nbsp_char"
-      page.body.encode('UTF-8').should have_content('ｱﾌﾞﾗ ｶﾀﾞﾌﾞﾗ')
+      expect(page.body.encode('UTF-8')).to have_content('ｱﾌﾞﾗ ｶﾀﾞﾌﾞﾗ')
     end
   end
 
   shared_examples_for "hankaku_filter :input => false のとき" do
     it "はtextareaの中でも半角に変換されること" do
       visit "/#{controller}/textarea"
-      page.body.encode('UTF-8').should have_content('ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ')
+      expect(page.body.encode('UTF-8')).to have_content('ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ')
     end
     it "はinputのvalueの中も半角に変換されること" do
       visit "/#{controller}/input_tag"
-      page.body.encode('UTF-8').should have_css('input[value="ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ"]')
+      expect(page.body.encode('UTF-8')).to have_css('input[value="ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ"]')
     end
     it "は 変換されない" do
       visit "/#{controller}/nbsp_char"
-      page.body.encode('UTF-8').should have_content('ｱﾌﾞﾗ ｶﾀﾞﾌﾞﾗ')
+      expect(page.body.encode('UTF-8')).to have_content('ｱﾌﾞﾗ ｶﾀﾞﾌﾞﾗ')
     end
   end
 
   shared_examples_for "文字コードフィルタが動作しているとき" do
     it "はhtml以外は変換しないこと" do
       visit "/#{controller}/rawdata"
-      page.body.encode('UTF-8').should have_content("アブラカダブラ")
-      page.response_headers['Content-Type'].should_not =~ /charset/i
+      expect(page.body.encode('UTF-8')).to have_content("アブラカダブラ")
+      expect(page.response_headers['Content-Type']).not_to match(/charset/i)
     end
     it "response.bodyが空のときは文字コードを変更しないこと" do
       visit "/#{controller}/empty"
-      page.response_headers['Content-Type'].should =~ /utf-8/i
+      expect(page.response_headers['Content-Type']).to match(/utf-8/i)
     end
   end
 
   shared_examples_for "Shift_JISで通信する端末との通信" do
     it "はShift_JISで携帯に送出されること" do
       visit "/#{controller}/abracadabra_utf8"
-      page.body.encode('UTF-8').should have_content("アブラカダブラ")
-      page.response_headers['Content-Type'].should =~ /Shift_JIS/i
+      expect(page.body.encode('UTF-8')).to have_content("アブラカダブラ")
+      expect(page.response_headers['Content-Type']).to match(/Shift_JIS/i)
     end
     it "はxhtmlでもShift_JISで携帯に送出されること" do
       visit "/#{controller}/abracadabra_xhtml_utf8"
 
-      page.body.encode('UTF-8').should have_content("アブラカダブラ")
-      page.response_headers['Content-Type'].should =~ /Shift_JIS/i
+      expect(page.body.encode('UTF-8')).to have_content("アブラカダブラ")
+      expect(page.response_headers['Content-Type']).to match(/Shift_JIS/i)
     end
     it "はShift_JISで渡されたパラメタがparamsにUTF-8に変換されて格納されること" do
       visit "/#{controller}/index_zenkaku?q=#{URI.escape(utf8_to_sjis("アブラカダブラ"))}"
-      page.body.encode('UTF-8').should have_content('true')
+      expect(page.body.encode('UTF-8')).to have_content('true')
     end
     it "は半角カナのparamsを変換しないこと" do
       # アブラカダブラ半角,SJIS
       visit "/#{controller}/index_hankaku?q=#{URI.escape(sjis("\261\314\336\327\266\300\336\314\336\327"))}"
-      page.body.encode('UTF-8').should have_content('true')
+      expect(page.body.encode('UTF-8')).to have_content('true')
     end
     it_should_behave_like "文字コードフィルタが動作しているとき"
   end
@@ -76,21 +76,21 @@ describe "jpmobile integration spec" do
   shared_examples_for "UTF-8で通信する端末との通信" do
     it "はUTF-8で携帯に送出されること" do
       visit "/#{controller}/abracadabra_utf8"
-      page.body.encode('UTF-8').should have_content("アブラカダブラ")
-      page.response_headers['Content-Type'].should =~ /utf-8/i
+      expect(page.body.encode('UTF-8')).to have_content("アブラカダブラ")
+      expect(page.response_headers['Content-Type']).to match(/utf-8/i)
     end
     it "はxhtmlでもUTF-8で携帯に送出されること" do
       visit "/#{controller}/abracadabra_xhtml_utf8"
-      page.body.encode('UTF-8').should have_content("アブラカダブラ")
-      page.response_headers['Content-Type'].should =~ /utf-8/i
+      expect(page.body.encode('UTF-8')).to have_content("アブラカダブラ")
+      expect(page.response_headers['Content-Type']).to match(/utf-8/i)
     end
     it "はparamsにUTF-8のまま格納されること" do
       visit "/#{controller}/index_zenkaku?q=#{URI.escape("アブラカダブラ")}"
-      page.body.encode('UTF-8').should have_content('true')
+      expect(page.body.encode('UTF-8')).to have_content('true')
     end
     it "は半角カナのparamsを変換しないこと" do
       visit "/#{controller}/index_hankaku?q=#{URI.escape("ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ")}"
-      page.body.encode('UTF-8').should have_content('true')
+      expect(page.body.encode('UTF-8')).to have_content('true')
     end
     it_should_behave_like "文字コードフィルタが動作しているとき"
   end
@@ -98,17 +98,17 @@ describe "jpmobile integration spec" do
   shared_examples_for "Shift_JISで通信する端末との通信(半角変換付き)" do
     it "は半角に変換されShift_JISで携帯に送出されること" do
       visit "/#{controller}/abracadabra_utf8"
-      page.body.encode('UTF-8').should have_content("ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ") # アブラカダブラ半角,SJIS
-      page.response_headers['Content-Type'].should =~ /Shift_JIS/
+      expect(page.body.encode('UTF-8')).to have_content("ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ") # アブラカダブラ半角,SJIS
+      expect(page.response_headers['Content-Type']).to match(/Shift_JIS/)
     end
     it "はShift_JISで渡されたパラメタがparamsにUTF-8に変換されて格納されること" do
       visit "/#{controller}/index_zenkaku?q=#{URI.escape(utf8_to_sjis("アブラカダブラ"))}"
-      page.body.encode('UTF-8').should have_content('true')
+      expect(page.body.encode('UTF-8')).to have_content('true')
     end
     it "は半角Shift_JISで渡されたパラメタがparamsに全角UTF-8に変換されて格納されること" do
       # アブラカダブラ半角,SJIS
       visit "/#{controller}/index_zenkaku?q=#{URI.escape(sjis("\261\314\336\327\266\300\336\314\336\327"))}"
-      page.body.encode('UTF-8').should have_content('true')
+      expect(page.body.encode('UTF-8')).to have_content('true')
     end
     it_should_behave_like "文字コードフィルタが動作しているとき"
   end
@@ -116,16 +116,16 @@ describe "jpmobile integration spec" do
   shared_examples_for "UTF-8で通信する端末との通信(半角変換付き)" do
     it "はUTF-8半角で携帯に送出されること" do
       visit "/#{controller}/abracadabra_utf8"
-      page.body.encode('UTF-8').should have_content("ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ")
-      page.response_headers['Content-Type'].should =~ /utf-8/i
+      expect(page.body.encode('UTF-8')).to have_content("ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ")
+      expect(page.response_headers['Content-Type']).to match(/utf-8/i)
     end
     it "はparamsにUTF-8のまま格納されること" do
       visit "/#{controller}/index_zenkaku?q=#{URI.escape("アブラカダブラ")}"
-      page.body.encode('UTF-8').should have_content('true')
+      expect(page.body.encode('UTF-8')).to have_content('true')
     end
     it "は半角で渡されたparamsを全角に変換して格納すること" do
       visit "/#{controller}/index_zenkaku?q=#{URI.escape("ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ")}"
-      page.body.encode('UTF-8').should have_content('true')
+      expect(page.body.encode('UTF-8')).to have_content('true')
     end
     it_should_behave_like "文字コードフィルタが動作しているとき"
   end
@@ -214,7 +214,7 @@ describe "jpmobile integration spec" do
 
       it "Content-Type が Shift_JIS であること" do
         visit "/#{controller }/with_charset"
-        body.should match(/Shift_JIS/)
+        expect(body).to match(/Shift_JIS/)
       end
     end
 
@@ -228,7 +228,7 @@ describe "jpmobile integration spec" do
 
       it "Content-Type が UTF-8 であること" do
         visit "/#{controller}/with_charset"
-        page.response_headers['Content-Type'].should match(/UTF-8/i)
+        expect(page.response_headers['Content-Type']).to match(/UTF-8/i)
       end
     end
   end

data/test/rails/overrides/spec/helpers/helpers_spec.rb

@@ -1,13 +1,13 @@
 require 'rails_helper'
 
-describe Jpmobile::Helpers do
+describe Jpmobile::Helpers, :type => :helper do
   include Jpmobile::Helpers
   it "docomo_guid_link_to が guid=ON を付けたリンクを生成すること" do
-    docomo_guid_link_to("STRING", :controller => "filter", :action => "rawdata").should == %{<a href="/filter/rawdata?guid=ON">STRING</a>}
+    expect(docomo_guid_link_to("STRING", :controller => "filter", :action => "rawdata")).to eq(%{<a href="/filter/rawdata?guid=ON">STRING</a>})
   end
 
   it "softbank_location_link_to がリンク先にパラメータを含んでいても正常に動作すること" do
     # http://d.hatena.ne.jp/mizincogrammer/20090123/1232702067
-    softbank_location_link_to("STRING", :controller => "filter", :action => "rawdata", :p => "param").should == %{<a href="location:auto?url=http://test.host/filter/rawdata&amp;p=param">STRING</a>}
+    expect(softbank_location_link_to("STRING", :controller => "filter", :action => "rawdata", :p => "param")).to eq(%{<a href="location:auto?url=http://test.host/filter/rawdata&amp;p=param">STRING</a>})
   end
 end