jpmobile 5.0.0 → 5.0.1

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

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe LinksController, :type => :controller do
+describe LinksController, type: :controller do
   render_views
 
   # 文字列 +str+ 中に含まれるリンクについて、
@@ -8,194 +8,194 @@ describe LinksController, :type => :controller do
   # の3要素からなる配列の配列で返す。
   def get_href_and_texts(str)
     results = []
-    (Nokogiri::HTML.parse(str)/"a").each do |link|
-      path, query = link["href"].split(/\?/, 2)
+    (Nokogiri::HTML.parse(str) / 'a').each do |link|
+      path, query = link['href'].split(/\?/, 2)
       params = query.nil? ? nil : Rack::Utils.parse_query(query)
       results << [link.inner_html, link.attributes, path, params]
     end
-    return results
+    results
   end
 
-  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)"
+  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)'
     expect {
       get :show_all
     }.not_to raise_error
   end
 
-  context "docomo で" do
-    it "get_position_link_to が正常に表示されること" do
-      request.user_agent = "DoCoMo/2.0 SH903i(c100;TB;W24H16)"
+  context 'docomo で' do
+    it 'get_position_link_to が正常に表示されること' do
+      request.user_agent = 'DoCoMo/2.0 SH903i(c100;TB;W24H16)'
       get :link
       links = get_href_and_texts(response.body)
 
       expect(links.size).to eq(1)
-      text, attrs, path, params = links.first
-      expect(text).to eq("STRING")
-      expect(path).to eq("http://test.host/links/link")
+      text, _, path, = links.first
+      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
-      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)"
+    it 'docomo_utn_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)'
       get :docomo_utn
       links = get_href_and_texts(response.body)
 
       expect(links.size).to eq(1)
-      text, attrs, path, params = links.first
-      expect(text).to eq("STRING")
-      expect(path).to eq("http://test.host/links/docomo_utn")
+      text, _, path, = links.first
+      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
-      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)"
+    it 'オープンiエリア取得用のリンクが正しく出力されること' 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)'
       get :docomo_openiarea
       links = get_href_and_texts(response.body)
 
       expect(links.size).to eq(1)
-      text, attrs, path, params = links.first
-      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")
+      text, _, path, params = links.first
+      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
-      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)"
+    it 'GPS取得用のリンクが正しく出力されること' 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)'
       get :docomo_foma_gps
       links = get_href_and_texts(response.body)
 
       expect(links.size).to eq(1)
-      text, attrs, path, params = links.first
-      expect(text).to eq("STRING")
-      expect(path).to eq("http://test.host/links/docomo_foma_gps")
+      text, _, path, = links.first
+      expect(text).to eq('STRING')
+      expect(path).to eq('http://test.host/links/docomo_foma_gps')
       expect(response.body).to match(/lcs>/)
     end
   end
 
-  context "au で" do
+  context 'au で' do
     # get_position_link_to(自動判別), au, location only
     def test_get_position_link_to_au_location_only
-      request.user_agent = "KDDI-SN26 UP.Browser/6.2.0.6.2 (GUI) MMP/2.0"
+      request.user_agent = 'KDDI-SN26 UP.Browser/6.2.0.6.2 (GUI) MMP/2.0'
       get :link
       links = get_href_and_texts(response.body)
       assert_equal(1, links.size)
-      text, attrs, path, params = links.first
-      assert_equal("STRING", text)
-      assert_equal("device:location", path)
-      assert_equal("http://test.host/links/link", params["url"])
+      text, _, path, params = links.first
+      assert_equal('STRING', text)
+      assert_equal('device:location', path)
+      assert_equal('http://test.host/links/link', params['url'])
     end
 
     # get_position_link_to(自動判別), au, gps
     def test_get_position_link_to_au_gps
-      request.user_agent = "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0"
+      request.user_agent = 'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0'
       get :link
       links = get_href_and_texts(response.body)
       assert_equal(1, links.size)
-      text, attrs, path, params = links.first
-      assert_equal("STRING", text)
-      assert_equal("device:gpsone", path)
-      assert_equal("http://test.host/links/link", params["url"])
-      assert_equal("0", params["number"])
-      assert_equal("0", params["acry"])
-      assert_equal("1", params["ver"])
-      assert_equal("0", params["unit"])
-      assert_equal("0", params["datum"])
+      text, _, path, params = links.first
+      assert_equal('STRING', text)
+      assert_equal('device:gpsone', path)
+      assert_equal('http://test.host/links/link', params['url'])
+      assert_equal('0', params['number'])
+      assert_equal('0', params['acry'])
+      assert_equal('1', params['ver'])
+      assert_equal('0', params['unit'])
+      assert_equal('0', params['datum'])
     end
 
     # au簡易位置情報取得用のリンクが正しく出力されるか。
     def test_au_location_link_to
-      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)"
+      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)'
       get :au_location
       links = get_href_and_texts(response.body)
       assert_equal(1, links.size)
-      text, attrs, path, params = links.first
-      assert_equal("STRING", text)
-      assert_equal("device:location", path)
-      assert_equal("http://test.host/links/au_location", params["url"])
+      text, _, path, params = links.first
+      assert_equal('STRING', text)
+      assert_equal('device:location', path)
+      assert_equal('http://test.host/links/au_location', params['url'])
     end
 
     # au GPS位置情報取得用のリンクが正しく出力されるか。
     def test_au_gps_link_to
-      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)"
+      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)'
       get :au_gps
       links = get_href_and_texts(response.body)
       assert_equal(1, links.size)
-      text, attrs, path, params = links.first
-      assert_equal("STRING", text)
-      assert_equal("device:gpsone", path)
-      assert_equal("http://test.host/links/au_gps", params["url"])
-      assert_equal("0", params["number"])
-      assert_equal("0", params["acry"])
-      assert_equal("1", params["ver"])
-      assert_equal("0", params["unit"])
-      assert_equal("0", params["datum"])
+      text, _, path, params = links.first
+      assert_equal('STRING', text)
+      assert_equal('device:gpsone', path)
+      assert_equal('http://test.host/links/au_gps', params['url'])
+      assert_equal('0', params['number'])
+      assert_equal('0', params['acry'])
+      assert_equal('1', params['ver'])
+      assert_equal('0', params['unit'])
+      assert_equal('0', params['datum'])
     end
   end
 
-  context "softbank で" do
+  context 'softbank で' do
     # get_position_link_to(自動判別), Vodafone
     def test_get_position_link_to_vodafone
-      request.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"
+      request.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'
       get :link
       links = get_href_and_texts(response.body)
       assert_equal(1, links.size)
-      text, attrs, path, params = links.first
-      assert_equal("STRING", text)
-      assert_equal("location:auto", path)
+      text, _, path, = links.first
+      assert_equal('STRING', text)
+      assert_equal('location:auto', path)
     end
 
     # get_position_link_to(自動判別), Softbank
     def test_get_position_link_to_softbank
-      request.user_agent = "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
+      request.user_agent = 'SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1'
       get :link
       links = get_href_and_texts(response.body)
       assert_equal(1, links.size)
-      text, attrs, path, params = links.first
-      assert_equal("STRING", text)
-      assert_equal("location:auto", path)
+      text, _, path, = links.first
+      assert_equal('STRING', text)
+      assert_equal('location:auto', path)
     end
 
     # Softbank 3G 位置情報取得用のリンクが正しく出力されるか。
     def test_softbank_location_link_to
-      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)"
+      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)'
       get :softbank_location
       links = get_href_and_texts(response.body)
       assert_equal(1, links.size)
-      text, attrs, path, params = links.first
-      assert_equal("STRING", text)
-      assert_equal("location:auto", path)
+      text, _, path, = links.first
+      assert_equal('STRING', text)
+      assert_equal('location:auto', path)
     end
   end
 
-  context "willcom で" do
+  context 'willcom で' do
     # get_position_link_to(自動判別), Willcom
     def test_get_position_link_to_willcom
-      request.user_agent = "Mozilla/3.0(WILLCOM;KYOCERA/WX310K/2;1.2.2.16.000000/0.1/C100) Opera 7.0"
+      request.user_agent = 'Mozilla/3.0(WILLCOM;KYOCERA/WX310K/2;1.2.2.16.000000/0.1/C100) Opera 7.0'
       get :link
       links = get_href_and_texts(response.body)
       assert_equal(1, links.size)
-      text, attrs, path, params = links.first
-      assert_equal("STRING", text)
-      assert_equal("http://location.request/dummy.cgi", path)
-      assert_equal("http://test.host/links/link", params["my"])
-      assert_equal("$location", params["pos"])
+      text, _, path, params = links.first
+      assert_equal('STRING', text)
+      assert_equal('http://location.request/dummy.cgi', path)
+      assert_equal('http://test.host/links/link', params['my'])
+      assert_equal('$location', params['pos'])
     end
 
     # Willcom 位置情報取得用のリンクが正しく出力されるか。
     def test_willcom_location_link_to
-      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)"
+      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)'
       get :willcom_location
       links = get_href_and_texts(response.body)
       assert_equal(1, links.size)
-      text, attrs, path, params = links.first
-      assert_equal("STRING", text)
-      assert_equal("http://location.request/dummy.cgi", path)
-      assert_equal("http://test.host/links/willcom_location", params["my"])
-      assert_equal("$location", params["pos"])
+      text, _, path, params = links.first
+      assert_equal('STRING', text)
+      assert_equal('http://location.request/dummy.cgi', path)
+      assert_equal('http://test.host/links/willcom_location', params['my'])
+      assert_equal('$location', params['pos'])
     end
   end
 end

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

@@ -5,7 +5,7 @@ describe MobileSpecController, type: :controller do
 
   describe "GET 'index'" do
     context 'PC access' do
-      it "should be successful" do
+      it 'should be successful' do
         request.user_agent = 'Mozilla'
         get 'index'
 
@@ -16,8 +16,8 @@ describe MobileSpecController, type: :controller do
     end
 
     context 'mobile access' do
-      it "should be successful" do
-        request.user_agent = "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+      it 'should be successful' do
+        request.user_agent = 'DoCoMo/2.0 SH902i(c100;TB;W24H12)'
         get 'index'
         expect(response).to be_success
         expect(response.body).to match(/RailsRoot mobile/)
@@ -29,7 +29,7 @@ describe MobileSpecController, type: :controller do
 
   describe "GET 'file_render'" do
     context 'PC access' do
-      it "should be successful" do
+      it 'should be successful' do
         request.user_agent = 'Mozilla'
         get 'file_render'
 
@@ -40,8 +40,8 @@ describe MobileSpecController, type: :controller do
     end
 
     context 'mobile access' do
-      it "should be successful" do
-        request.user_agent = "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+      it 'should be successful' do
+        request.user_agent = 'DoCoMo/2.0 SH902i(c100;TB;W24H12)'
         get 'file_render'
 
         expect(response).to be_success
@@ -63,7 +63,7 @@ describe MobileSpecController, type: :controller do
     end
 
     context 'PC access' do
-      it "should be successful" do
+      it 'should be successful' do
         request.user_agent = 'Mozilla'
         get 'no_mobile'
 
@@ -73,8 +73,8 @@ describe MobileSpecController, type: :controller do
     end
 
     context 'mobile access' do
-      it "should be successful" do
-        request.user_agent = "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+      it 'should be successful' do
+        request.user_agent = 'DoCoMo/2.0 SH902i(c100;TB;W24H12)'
         get 'no_mobile'
 
         expect(response).to be_success

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

@@ -1,85 +1,85 @@
 require 'rails_helper'
 
-describe TemplatePathController, :type => :controller do
+describe TemplatePathController, type: :controller do
   before do
     request.user_agent = user_agent
   end
 
-  describe "DoCoMo SH902i からのアクセス" do
+  describe 'DoCoMo SH902i からのアクセス' do
     let(:user_agent) do
-      "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+      'DoCoMo/2.0 SH902i(c100;TB;W24H12)'
     end
 
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      expect(controller.lookup_context.mobile).to eq([ 'mobile_docomo', 'mobile' ])
+      expect(controller.lookup_context.mobile).to eq(%w[mobile_docomo mobile])
     end
   end
 
-  describe "au CA32 からのアクセス" do
+  describe 'au CA32 からのアクセス' do
     let(:user_agent) do
-      "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0"
+      'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0'
     end
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      expect(controller.lookup_context.mobile).to eq([ 'mobile_au', 'mobile' ])
+      expect(controller.lookup_context.mobile).to eq(%w[mobile_au mobile])
     end
   end
 
-  describe "Vodafone V903T からのアクセス" do
+  describe 'Vodafone V903T からのアクセス' do
     let(:user_agent) do
-      "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"
+      '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'
     end
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      expect(controller.lookup_context.mobile).to eq([ 'mobile_vodafone', 'mobile_softbank', 'mobile' ])
+      expect(controller.lookup_context.mobile).to eq(%w[mobile_vodafone mobile_softbank mobile])
     end
   end
 
-  describe "SoftBank 910T からのアクセス" do
+  describe 'SoftBank 910T からのアクセス' do
     let(:user_agent) do
-      "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
+      'SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1'
     end
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      expect(controller.lookup_context.mobile).to eq([ 'mobile_softbank', 'mobile' ])
+      expect(controller.lookup_context.mobile).to eq(%w[mobile_softbank mobile])
     end
   end
 
-  describe "iPhone からのアクセス" do
+  describe 'iPhone からのアクセス' do
     let(:user_agent) do
       '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'
     end
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      expect(controller.lookup_context.mobile).to eq([ 'smart_phone_iphone', 'smart_phone' ])
+      expect(controller.lookup_context.mobile).to eq(%w[smart_phone_iphone smart_phone])
     end
   end
 
-  describe "Android からのアクセス" do
+  describe 'Android からのアクセス' do
     let(:user_agent) do
       'Mozilla/5.0 (Linux; U; Android 1.6; ja-jp; SonyEriccsonSO-01B Build/R1EA018) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1'
     end
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      expect(controller.lookup_context.mobile).to eq([ 'smart_phone_android', 'smart_phone' ])
+      expect(controller.lookup_context.mobile).to eq(%w[smart_phone_android smart_phone])
     end
   end
 
-  describe "Windows Phone からのアクセス" do
+  describe 'Windows Phone からのアクセス' do
     let(:user_agent) do
       'Mozilla/4.0 (Compatible; MSIE 6.0; Windows NT 5.1 T-01A_6.5; Windows Phone 6.5)'
     end
     it 'テンプレートの探索順が正しいこと' do
       get :index
 
-      expect(controller.lookup_context.mobile).to eq([ 'smart_phone_windows_phone', 'smart_phone' ])
+      expect(controller.lookup_context.mobile).to eq(%w[smart_phone_windows_phone smart_phone])
     end
   end
 end