jpmobile 4.1.1 → 4.1.4

data/test/rails/overrides/spec/mailers/normal_mailer_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe NormalMailer do
+describe NormalMailer, :type => :mailer do
   include Jpmobile::Util
 
   before(:each) do
@@ -15,19 +15,19 @@ describe NormalMailer do
     it "正常に送信できること" do
       email = NormalMailer.msg(@to, "題名", "本文").deliver
 
-      ActionMailer::Base.deliveries.size.should == 1
-      (email.to - @to).should be_empty
+      expect(ActionMailer::Base.deliveries.size).to eq(1)
+      expect(email.to - @to).to be_empty
     end
 
     it "UTF-8のままであること" do
       email = NormalMailer.msg(@to, @subject, @text).deliver
 
-      ActionMailer::Base.deliveries.size.should == 1
+      expect(ActionMailer::Base.deliveries.size).to eq(1)
 
       raw_mail = ascii_8bit(email.to_s)
-      raw_mail.should match(/UTF-8/i)
-      raw_mail.should match(Regexp.escape("=E6=97=A5=E6=9C=AC=E8=AA=9E=E9=A1=8C=E5=90=8D"))
-      raw_mail.should match(Regexp.escape([@text].pack("m").strip))
+      expect(raw_mail).to match(/UTF-8/i)
+      expect(raw_mail).to match(Regexp.escape("=E6=97=A5=E6=9C=AC=E8=AA=9E=E9=A1=8C=E5=90=8D"))
+      expect(raw_mail).to match(Regexp.escape([@text].pack("m").strip))
     end
   end
 end

data/test/rails/overrides/spec/requests/docomo_spec.rb

@@ -1,19 +1,19 @@
 require 'rails_helper'
 
-describe "DoCoMo SH902i からのアクセス" do
+describe "DoCoMo SH902i からのアクセス", :type => :request do
   it "request.mobile は Docomo のインスタンスであるべき" do
     get "/mobile_spec/index", {}, {"HTTP_USER_AGENT" => "DoCoMo/2.0 SH902i(c100;TB;W24H12)"}
 
-    request.mobile.should be_an_instance_of(Jpmobile::Mobile::Docomo)
+    expect(request.mobile).to be_an_instance_of(Jpmobile::Mobile::Docomo)
   end
   it "request.mobile? は true であるべき" do
     get "/mobile_spec/index", {}, {"HTTP_USER_AGENT" => "DoCoMo/2.0 SH902i(c100;TB;W24H12)"}
 
-    request.mobile?.should be_truthy
+    expect(request.mobile?).to be_truthy
   end
 end
 
-describe "DoCoMo SH902i からguid付きのアクセス" do
+describe "DoCoMo SH902i からguid付きのアクセス", :type => :request do
   before(:each) do
     @headers = {"HTTP_USER_AGENT" => "DoCoMo/2.0 SH902i(c100;TB;W24H12)", 'HTTP_X_DCMGUID' => "000000a"}
   end
@@ -21,11 +21,11 @@ describe "DoCoMo SH902i からguid付きのアクセス" do
   it "guidを正しく取得できること" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile.guid.should == "000000a"
+    expect(request.mobile.guid).to eq("000000a")
   end
   it "ident_subscriberでも正しく取得できること" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile.ident_subscriber.should == "000000a"
+    expect(request.mobile.ident_subscriber).to eq("000000a")
   end
 end

data/test/rails/overrides/spec/requests/emobile_spec.rb

@@ -12,22 +12,22 @@ describe "H11T モバイルブラウザからのアクセス" do
   it "request.mobile は Emobile のインスタンスであること" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile.should be_an_instance_of(Jpmobile::Mobile::Emobile)
+    expect(request.mobile).to be_an_instance_of(Jpmobile::Mobile::Emobile)
   end
   it "request.mobile? は true であること" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile?.should be_truthy
+    expect(request.mobile?).to be_truthy
   end
   it "のsubscribe番号を取得できること" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile.ident_subscriber.should == "u00000000000000000"
+    expect(request.mobile.ident_subscriber).to eq("u00000000000000000")
   end
   it "のIPアドレス空間を正しく検証できること" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile.valid_ip?.should be_truthy
+    expect(request.mobile.valid_ip?).to be_truthy
   end
 end
 
@@ -41,11 +41,11 @@ describe "S11HT からのアクセス" do
   it "request.mobile は Emobile のインスタンスであること" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile.should be_an_instance_of(Jpmobile::Mobile::Emobile)
+    expect(request.mobile).to be_an_instance_of(Jpmobile::Mobile::Emobile)
   end
   it "request.mobile? は true であること" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile?.should be_truthy
+    expect(request.mobile?).to be_truthy
   end
 end

data/test/rails/overrides/spec/requests/pc_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "PCからのアクセスの場合" do
+describe "PCからのアクセスの場合", :type => :request do
   before do
     @headers = {
       "HTTP_USER_AGENT" => "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 1.1.4322)",
@@ -10,11 +10,11 @@ describe "PCからのアクセスの場合" do
   it "request.mobile は nil であるべき" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile.should be_nil
+    expect(request.mobile).to be_nil
   end
   it "request.mobile? は false であるべき" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile?.should be_falsey
+    expect(request.mobile?).to be_falsey
   end
 end

data/test/rails/overrides/spec/requests/softbank_emulator_spec.rb

@@ -1,19 +1,19 @@
 require 'rails_helper'
 
-describe "Softbank Emulator からのアクセスのとき" do
+describe "Softbank Emulator からのアクセスのとき", :type => :request do
   it "request.mobile は Softbank のインスタンスであること" do
     get "/mobile_spec/index", {}, {"HTTP_USER_AGENT" => "Semulator"}
 
-    request.mobile.should be_an_instance_of(Jpmobile::Mobile::Softbank)
-    request.mobile?.should be_truthy
+    expect(request.mobile).to be_an_instance_of(Jpmobile::Mobile::Softbank)
+    expect(request.mobile?).to be_truthy
   end
 end
 
-describe "Vodafone Emulator からのアクセスのとき" do
+describe "Vodafone Emulator からのアクセスのとき", :type => :request do
   it "request.mobile は Vodafone のインスタンスであること" do
     get "/mobile_spec/index", {}, {"HTTP_USER_AGENT" => "Vemulator"}
 
-    request.mobile.should be_an_instance_of(Jpmobile::Mobile::Vodafone)
-    request.mobile?.should be_truthy
+    expect(request.mobile).to be_an_instance_of(Jpmobile::Mobile::Vodafone)
+    expect(request.mobile?).to be_truthy
   end
 end

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

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe TemplatePathController, "integrated_views" do
+describe TemplatePathController, "integrated_views", :type => :request do
   before do
     page.driver.header('User-Agent', user_agent)
   end
@@ -13,7 +13,7 @@ describe TemplatePathController, "integrated_views" do
       it 'index.html.erbが使用されること' do
         visit "/template_path/index"
 
-        page.should have_content("index.html.erb")
+        expect(page).to have_content("index.html.erb")
       end
     end
 
@@ -24,19 +24,19 @@ describe TemplatePathController, "integrated_views" do
       it 'index_mobile_docomo.html.erbが使用されること' do
         visit "/template_path/index"
 
-        page.should have_content("index_mobile_docomo.html.erb")
+        expect(page).to have_content("index_mobile_docomo.html.erb")
       end
 
       it 'show.html.erb がなくとも show_mobile_docomo.html.erbが使用されること' do
         visit "/template_path/show"
 
-        page.should have_content("show_mobile_docomo.html.erb")
+        expect(page).to have_content("show_mobile_docomo.html.erb")
       end
 
       it 'disable_mobile_view! のときには index.html.erb が使用されること' do
         visit "/template_path/index?pc=true"
 
-        page.should have_content("index.html.erb")
+        expect(page).to have_content("index.html.erb")
       end
     end
 
@@ -47,13 +47,13 @@ describe TemplatePathController, "integrated_views" do
       it 'index_mobile.html.erbが使用されること' do
         visit "/template_path/index"
 
-        page.should have_content("index_mobile.html.erb")
+        expect(page).to have_content("index_mobile.html.erb")
       end
 
       it 'show.html.erb がなくとも show_mobile.html.erbが使用されること' do
         visit "/template_path/show"
 
-        page.should have_content("show_mobile.html.erb")
+        expect(page).to have_content("show_mobile.html.erb")
       end
     end
 
@@ -64,7 +64,7 @@ describe TemplatePathController, "integrated_views" do
       it 'smart_phone_iphone.html.erbが使用されること' do
         visit "/template_path/index"
 
-        page.should have_content("smart_phone_iphone.html.erb")
+        expect(page).to have_content("smart_phone_iphone.html.erb")
       end
     end
 
@@ -75,7 +75,7 @@ describe TemplatePathController, "integrated_views" do
       it 'smart_phone.html.erbが使用されること' do
         visit "/template_path/index"
 
-        page.should have_content("smart_phone.html.erb")
+        expect(page).to have_content("smart_phone.html.erb")
       end
     end
 
@@ -86,7 +86,7 @@ describe TemplatePathController, "integrated_views" do
       it 'smart_phone.html.erbが使用されること' do
         visit "/template_path/index"
 
-        page.should have_content("smart_phone.html.erb")
+        expect(page).to have_content("smart_phone.html.erb")
       end
     end
   end
@@ -99,7 +99,7 @@ describe TemplatePathController, "integrated_views" do
       it 'smart_phone_only.html.erbが使用されること' do
         visit '/template_path/smart_phone_only'
 
-        page.should have_content('smart_phone_only_smart_phone.html.erb')
+        expect(page).to have_content('smart_phone_only_smart_phone.html.erb')
       end
     end
 
@@ -110,7 +110,7 @@ describe TemplatePathController, "integrated_views" do
       it 'smart_phone_only.html.erbが使用されること' do
         visit '/template_path/smart_phone_only'
 
-        page.should have_content('smart_phone_only_smart_phone.html.erb')
+        expect(page).to have_content('smart_phone_only_smart_phone.html.erb')
       end
     end
   end
@@ -123,7 +123,7 @@ describe TemplatePathController, "integrated_views" do
       it 'with_tblt_tablet.html.erbが使用されること' do
         visit '/template_path/with_tblt'
 
-        page.should have_content('with_tblt_tablet.html.erb')
+        expect(page).to have_content('with_tblt_tablet.html.erb')
       end
     end
 
@@ -134,7 +134,7 @@ describe TemplatePathController, "integrated_views" do
       it 'with_tblt_tablet.html.erbが使用されること' do
         visit '/template_path/with_tblt'
 
-        page.should have_content('with_tblt_tablet.html.erb')
+        expect(page).to have_content('with_tblt_tablet.html.erb')
       end
     end
   end
@@ -147,7 +147,7 @@ describe TemplatePathController, "integrated_views" do
       it 'with_ipd_tablet_ipad.html.erbが使用されること' do
         visit '/template_path/with_ipd'
 
-        page.should have_content('with_ipd_tablet_ipad.html.erb')
+        expect(page).to have_content('with_ipd_tablet_ipad.html.erb')
       end
     end
 
@@ -158,7 +158,7 @@ describe TemplatePathController, "integrated_views" do
       it 'with_ipd.html.erbが使用されること' do
         visit '/template_path/with_ipd'
 
-        page.should have_content('with_ipd.html.erb')
+        expect(page).to have_content('with_ipd.html.erb')
       end
     end
   end
@@ -171,7 +171,7 @@ describe TemplatePathController, "integrated_views" do
       it '_partial.html.erbが使用されること' do
         visit "/template_path/partial"
 
-        page.should have_content("_partial.html.erb")
+        expect(page).to have_content("_partial.html.erb")
       end
     end
 
@@ -182,7 +182,7 @@ describe TemplatePathController, "integrated_views" do
       it '_partial_mobile_docomo.html.erbが使用されること' do
         visit "/template_path/partial"
 
-        page.should have_content("_partial_mobile_docomo.html.erb")
+        expect(page).to have_content("_partial_mobile_docomo.html.erb")
       end
     end
 
@@ -193,7 +193,7 @@ describe TemplatePathController, "integrated_views" do
       it '_partial_mobile.html.erbが使用されること' do
         visit "/template_path/partial"
 
-        page.should have_content("_partial_mobile.html.erb")
+        expect(page).to have_content("_partial_mobile.html.erb")
       end
     end
 
@@ -204,7 +204,7 @@ describe TemplatePathController, "integrated_views" do
       it '_partial_smart_phone_iphone.html.erbが使用されること' do
         visit "/template_path/partial"
 
-        page.should have_content("_partial_smart_phone_iphone.html.erb")
+        expect(page).to have_content("_partial_smart_phone_iphone.html.erb")
       end
     end
 
@@ -215,7 +215,7 @@ describe TemplatePathController, "integrated_views" do
       it '_partial_smart_phone.html.erbが使用されること' do
         visit "/template_path/partial"
 
-        page.should have_content("_partial_smart_phone.html.erb")
+        expect(page).to have_content("_partial_smart_phone.html.erb")
       end
     end
 
@@ -226,7 +226,7 @@ describe TemplatePathController, "integrated_views" do
       it '_partial_smart_phone.html.erbが使用されること' do
         visit "/template_path/partial"
 
-        page.should have_content("_partial_smart_phone.html.erb")
+        expect(page).to have_content("_partial_smart_phone.html.erb")
       end
     end
   end
@@ -239,7 +239,7 @@ describe TemplatePathController, "integrated_views" do
       it '_partial.html.erbが使用されること' do
         visit "/template_path/full_path_partial"
 
-        page.should have_content("_partial.html.erb")
+        expect(page).to have_content("_partial.html.erb")
       end
     end
 
@@ -250,7 +250,7 @@ describe TemplatePathController, "integrated_views" do
       it '_partial_mobile_docomo.html.erbが使用されること' do
         visit "/template_path/full_path_partial"
 
-        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/requests/trans_sid_spec.rb

@@ -18,7 +18,7 @@ def describe_mobile_with_ua(user_agent, charset, &block)
   end
 end
 
-describe "trans_sid functional" do
+describe "trans_sid functional", :type => :request do
   before(:each) do
     @user ||= User.create(:name => "hoge")
   end
@@ -27,12 +27,12 @@ describe "trans_sid functional" do
     it "で link_to の自動書き換えが行われない" do
       res = get_with_session(@controller, "link", @user_agent)
 
-      res.response.body.should =~ /<a href=\"\/.+?\/link\">linkto<\/a>/
+      expect(res.response.body).to match(/<a href=\"\/.+?\/link\">linkto<\/a>/)
     end
     it "で form の自動書き換えが行われない" do
       res = get_with_session(@controller, "form", @user_agent)
 
-      res.response.body.should =~ /<form accept-charset="#{@charset}" action=\"\/.+?\/form\"/
+      expect(res.response.body).to match(/<form accept-charset="#{@charset}" action=\"\/.+?\/form\"/)
     end
     it "で redirect の自動書き換えが行われない" do
       res = get_with_session(@controller, "redirect", @user_agent)
@@ -45,16 +45,16 @@ describe "trans_sid functional" do
     it "で link_to の自動書き換えが行われる" do
       res = get_with_session(@controller, "link", @user_agent)
 
-      res.response.body.should =~ /<a href=\"\/.+?\/link\?_session_id=[a-zA-Z0-9]{32}\">linkto<\/a>/
+      expect(res.response.body).to match(/<a href=\"\/.+?\/link\?_session_id=[a-zA-Z0-9]{32}\">linkto<\/a>/)
     end
     it "で form内にhiddenが差し込まれる" do
       res = get_with_session(@controller, "form", @user_agent)
-      res.response.body.should =~ /<input type=\"hidden\" name=\".+\" value=\"[a-zA-Z0-9]{32}\"/
+      expect(res.response.body).to match(/<input type=\"hidden\" name=\".+\" value=\"[a-zA-Z0-9]{32}\"/)
     end
     it "で form の自動書き換えが行われる" do
       res = get_with_session(@controller, "form", @user_agent)
 
-      res.response.body.should =~ /<form accept-charset="#{@charset}" action=\"\/.+?\/form\?_session_id=[a-zA-Z0-9]{32}\"/
+      expect(res.response.body).to match(/<form accept-charset="#{@charset}" action=\"\/.+?\/form\?_session_id=[a-zA-Z0-9]{32}\"/)
     end
     it "で redirect の自動書き換えが行われる" do
       res = get_with_session(@controller, "redirect", @user_agent)
@@ -66,12 +66,12 @@ describe "trans_sid functional" do
     it "で @user の link_to の自動書き換えが行われる" do
       res = get_with_session(@controller, "link_path", @user_agent)
 
-      res.response.body.should =~ /<a href=\"\/users\/1\?_session_id=[a-zA-Z0-9]{32}\">linkto<\/a>/
+      expect(res.response.body).to match(/<a href=\"\/users\/1\?_session_id=[a-zA-Z0-9]{32}\">linkto<\/a>/)
     end
     it "で @user の form の自動書き換えが行われる" do
       res = get_with_session(@controller, "form_path", @user_agent)
 
-      res.response.body.should =~ /<form accept-charset="#{@charset}" action=\"\/users\/1\?_session_id=[a-zA-Z0-9]{32}\"/
+      expect(res.response.body).to match(/<form accept-charset="#{@charset}" action=\"\/users\/1\?_session_id=[a-zA-Z0-9]{32}\"/)
     end
     it "で @path の redirect の自動書き換えが行われる" do
       res = get_with_session(@controller, "redirect_path", @user_agent)
@@ -83,12 +83,12 @@ describe "trans_sid functional" do
     it "で [:admin, @user] の link_to の自動書き換えが行われる" do
       res = get_with_session(@controller, "link_path_admin", @user_agent)
 
-      res.response.body.should =~ /<a href=\"\/admin\/users\/1\?_session_id=[a-zA-Z0-9]{32}\">linkto<\/a>/
+      expect(res.response.body).to match(/<a href=\"\/admin\/users\/1\?_session_id=[a-zA-Z0-9]{32}\">linkto<\/a>/)
     end
     it "で [:admin, @user] の form の自動書き換えが行われる" do
       res = get_with_session(@controller, "form_path_admin", @user_agent)
 
-      res.response.body.should =~ /<form accept-charset="#{@charset}" action=\"\/admin\/users\/1\?_session_id=[a-zA-Z0-9]{32}\"/
+      expect(res.response.body).to match(/<form accept-charset="#{@charset}" action=\"\/admin\/users\/1\?_session_id=[a-zA-Z0-9]{32}\"/)
     end
     it "で [:admin, @path] の redirect の自動書き換えが行われる" do
       res = get_with_session(@controller, "redirect_path_admin", @user_agent)
@@ -107,7 +107,7 @@ describe "trans_sid functional" do
     it "の trans_sid_mode は nil" do
       get "/#{@controller}/link", {}, {"HTTP_USER_AGENT" => @user_agent}
 
-      controller.trans_sid_mode.should be_nil
+      expect(controller.trans_sid_mode).to be_nil
     end
     it_should_behave_like "trans_sid が起動しないとき"
   end
@@ -122,7 +122,7 @@ describe "trans_sid functional" do
     it "の trans_sid_mode は :none" do
       get "/#{@controller}/link", {}, {"HTTP_USER_AGENT" => @user_agent}
 
-      controller.trans_sid_mode.should == :none
+      expect(controller.trans_sid_mode).to eq(:none)
     end
     it_should_behave_like "trans_sid が起動しないとき"
   end
@@ -137,7 +137,7 @@ describe "trans_sid functional" do
     it "の trans_sid_mode は :always" do
       get "/#{@controller}/link", {}, {"HTTP_USER_AGENT" => @user_agent}
 
-      controller.trans_sid_mode.should == :always
+      expect(controller.trans_sid_mode).to eq(:always)
     end
     it_should_behave_like "trans_sid が起動するとき"
   end
@@ -152,7 +152,7 @@ describe "trans_sid functional" do
     it "で redirect_to がエラーにならない" do
       res = get_with_session(@controller, "redirect", @user_agent)
 
-      res.response.should be_redirect
+      expect(res.response).to be_redirect
     end
   end
 
@@ -166,7 +166,7 @@ describe "trans_sid functional" do
     it "の trans_sid_mode は :mobile" do
       get "/#{@controller}/link", {}, {"HTTP_USER_AGENT" => @user_agent}
 
-      controller.trans_sid_mode.should == :mobile
+      expect(controller.trans_sid_mode).to eq(:mobile)
     end
   end
 
@@ -180,7 +180,7 @@ describe "trans_sid functional" do
     it "の trans_sid_mode は :always" do
       res = get_with_session(@controller, "link", @user_agent)
 
-      res.controller.trans_sid_mode.should == :always
+      expect(res.controller.trans_sid_mode).to eq(:always)
     end
     it_should_behave_like "trans_sid が起動しないとき"
   end