jpmobile 6.1.2 → 7.0.2

data/spec/unit/receive_mail_spec.rb

@@ -12,7 +12,7 @@ describe 'Jpmobile::Mail#receive' do
 
   describe 'PC mail' do
     before(:each) do
-      @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/pc-mail-single.eml')).read)
+      @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/pc-mail-single.eml')))
     end
 
     it 'subject should be parsed correctly' do
@@ -49,7 +49,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'multipart' do
     describe 'PC mail' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/pc-mail-multi.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/pc-mail-multi.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -68,7 +68,7 @@ describe 'Jpmobile::Mail#receive' do
 
     describe 'PC mail without subject' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/pc-mail-attached-without-subject.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/pc-mail-attached-without-subject.eml')))
       end
 
       it 'body should be parsed correctly' do
@@ -84,7 +84,7 @@ describe 'Jpmobile::Mail#receive' do
     describe 'Docomo' do
       context 'with sjis decomail' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/docomo-gmail-sjis.eml')).read)
+          @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/docomo-gmail-sjis.eml')))
         end
 
         it 'subject should be parsed correctly' do
@@ -111,7 +111,7 @@ describe 'Jpmobile::Mail#receive' do
 
       context 'with jis decomail' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/docomo-decomail.eml')).read)
+          @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/docomo-decomail.eml')))
         end
 
         it 'does not contain charset within multipart Content-Type' do
@@ -129,7 +129,7 @@ describe 'Jpmobile::Mail#receive' do
 
     describe 'Au' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/au-decomail.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/au-decomail.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -151,7 +151,7 @@ describe 'Jpmobile::Mail#receive' do
     describe 'Softbank' do
       context 'Shift_JIS' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-sjis.eml')).read)
+          @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-sjis.eml')))
         end
 
         it 'subject should be parsed correctly' do
@@ -170,7 +170,7 @@ describe 'Jpmobile::Mail#receive' do
 
       context 'UTF-8' do
         before(:each) do
-          @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-utf8.eml')).read)
+          @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/softbank-gmail-utf8.eml')))
         end
 
         it 'subject should be parsed correctly' do
@@ -190,7 +190,7 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'bounced mail' do
       it 'should parse sub-part charset correctly' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/bounce_with_utf8_part.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/bounce_with_utf8_part.eml')))
         expect(@mail.parts.first.charset).to match(/iso-2022-jp/i)
         expect(@mail.parts.last.charset).to  match(/utf-8/i)
       end
@@ -199,7 +199,7 @@ describe 'Jpmobile::Mail#receive' do
 
   describe 'Docomo' do
     before(:each) do
-      @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/docomo-emoji.eml')).read)
+      @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/docomo-emoji.eml')))
     end
 
     it 'subject should be parsed correctly' do
@@ -234,7 +234,7 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'JIS mail' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/docomo-jis.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/docomo-jis.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -250,7 +250,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'Au' do
     context 'au-emoji.eml' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/au-emoji.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/au-emoji.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -286,36 +286,36 @@ describe 'Jpmobile::Mail#receive' do
 
     it 'should not be raised when parsing incoming email #41' do
       expect {
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/au-email.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/au-email.eml')))
       }.not_to raise_error
     end
 
     it 'should not be raised when parsing incoming email #45' do
       expect {
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/au-decomail2.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/au-decomail2.eml')))
       }.not_to raise_error
     end
 
     it 'should not be raised when parsing incoming email - include kigou' do
       expect {
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/au-kigou.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/au-kigou.eml')))
       }.not_to raise_error
     end
 
     context 'From au iPhone' do
       it 'charset should be UTF-8' do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')))
         expect(@mail.mobile).to be_a(Jpmobile::Mobile::Au)
         expect(@mail.charset).to match(/utf-8/i)
       end
 
       it 'should be encoded correctly' do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/iphone-message.eml')))
         expect(@mail.encoded).to match(Regexp.escape("%[\e$B1`;yL>\e(B]%\e$B$N\e(B%[\e$BJ]8n<TL>\e(B]%"))
       end
 
       it 'should decode cp932-encoded mail correctly' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-cp932.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/iphone-cp932.eml')))
         expect(@mail.subject).to eq 'Re: 【NKSC】test'
         expect(@mail.body.to_s).to eq 'テストです。㈱'
       end
@@ -323,20 +323,20 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'From iPad' do
       it 'charset should be UTF-8' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-mail3.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/iphone-mail3.eml')))
         expect(@mail.mobile).to be_a(Jpmobile::Mobile::AbstractMobile)
         expect(@mail.charset).to match(/utf-8/i)
       end
 
       it 'should be encoded correctly' do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-mail3.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/iphone-mail3.eml')))
         expect(@mail.encoded).to match(/BK\\J82~9T\$J\$7!2#5#1#2J8;z!2/)
       end
     end
 
     it 'should not raise when parsing attached email' do
       expect {
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/au-attached.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/au-attached.eml')))
         expect(@mail.encoded).to match('/9j/4AAQSkZJRgABAgAAZABkAAD/7AARRHVja3kAAQAEAAAAPQAA')
       }.not_to raise_error
     end
@@ -344,7 +344,7 @@ describe 'Jpmobile::Mail#receive' do
 
   describe 'Softbank' do
     before(:each) do
-      @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/softbank-emoji.eml')).read)
+      @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/softbank-emoji.eml')))
     end
 
     it 'subject should be parsed correctly' do
@@ -379,7 +379,7 @@ describe 'Jpmobile::Mail#receive' do
 
     describe 'blank-mail' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/softbank-blank.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/softbank-blank.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -395,7 +395,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'iPhone' do
     context 'JIS mail' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-jis.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/iphone-jis.eml')))
       end
 
       it 'body should be parsed correctly' do
@@ -405,7 +405,7 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'when the mail contains UTF-8 emojis' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-unicode-emoji.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/iphone-unicode-emoji.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -419,7 +419,7 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'when the mail contains circled-numbers' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, 'email-fixtures/iphone-circled-numbers-in-jis.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, 'email-fixtures/iphone-circled-numbers-in-jis.eml')))
       end
 
       it 'subject should be parsed correctly' do
@@ -435,7 +435,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'bounced mail' do
     context 'has jp address' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/bounced-jp.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/bounced-jp.eml')))
       end
 
       it 'mobile should abstract mobile' do
@@ -447,7 +447,7 @@ describe 'Jpmobile::Mail#receive' do
   describe 'non-Japanese mail' do
     context 'us-ascii' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/non-jp.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/non-jp.eml')))
       end
 
       it 'mobile should be nil' do
@@ -458,7 +458,7 @@ describe 'Jpmobile::Mail#receive' do
 
     context 'no From header' do
       before(:each) do
-        @mail = Mail.new(File.open(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/no-from.eml')).read)
+        @mail = Mail.new(File.read(File.join(__dir__, '../../test/rails/overrides/spec/fixtures/files/mobile_mailer/no-from.eml')))
       end
 
       it 'mobile should be nil' do

data/test/rails/overrides/Gemfile.jpmobile

@@ -14,3 +14,7 @@ group :development, :test do
   gem "rspec-rails"
   gem 'rails-controller-testing'
 end
+
+group :test do
+  gem 'cuprite'
+end

data/test/rails/overrides/app/controllers/mobile_spec_controller.rb

@@ -8,6 +8,6 @@ class MobileSpecController < ApplicationController
     render file: File.join(Rails.public_path, '422.html')
   end
 
-  def no_mobile
+  def mobile_not_exist
   end
 end

data/test/rails/overrides/app/controllers/template_path_controller.rb

@@ -10,6 +10,9 @@ class TemplatePathController < ApplicationController
   def show
   end
 
+  def partial
+  end
+
   def optioned_index
     render action: 'index'
   end

data/test/rails/overrides/app/mailers/decorated_mailer.rb

@@ -3,7 +3,7 @@ class DecoratedMailer < Jpmobile::Mailer::Base
   default to: 'info@jp.mobile'
 
   def deco_mail(to_mail)
-    attachments.inline['photo.jpg'] = File.open(File.join(Rails.root, 'spec/fixtures/files/mobile_mailer/photo.jpg')).read
+    attachments.inline['photo.jpg'] = File.read(File.join(Rails.root, 'spec/fixtures/files/mobile_mailer/photo.jpg'))
 
     mail(to: to_mail, subject: '題名', decorated: true)
   end

data/test/rails/overrides/app/views/mobile_spec/mobile_not_exist.html.erb

@@ -0,0 +1,3 @@
+PC mobile_not_exist
+
+<%= render 'partial_view_sample' -%>

data/test/rails/overrides/config/routes.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Performance/CollectionLiteralInLoop
 RailsRoot::Application.routes.draw do
   resources :users
   namespace :admin do
@@ -61,7 +62,7 @@ RailsRoot::Application.routes.draw do
   %w[
     index
     file_render
-    no_mobile
+    mobile_not_exist
   ].each do |a|
     get "mobile_spec/#{a}", to: "mobile_spec##{a}"
   end
@@ -102,3 +103,4 @@ RailsRoot::Application.routes.draw do
     end
   end
 end
+# rubocop:enable Performance/CollectionLiteralInLoop

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

@@ -52,7 +52,7 @@ describe MobileSpecController, type: :controller do
     end
   end
 
-  describe "GET 'no_mobile'" do
+  describe "GET 'mobile_not_exist'" do
     around do |example|
       orig_value = Jpmobile.config.fallback_view_selector
       Jpmobile.config.fallback_view_selector = true
@@ -65,7 +65,7 @@ describe MobileSpecController, type: :controller do
     context 'PC access' do
       it 'should be successful' do
         request.user_agent = 'Mozilla'
-        get 'no_mobile'
+        get 'mobile_not_exist'
 
         expect(response).to be_successful
         expect(response.body).not_to match('RailsRoot PC mobile')
@@ -75,7 +75,7 @@ describe MobileSpecController, type: :controller do
     context 'mobile access' do
       it 'should be successful' do
         request.user_agent = 'DoCoMo/2.0 SH902i(c100;TB;W24H12)'
-        get 'no_mobile'
+        get 'mobile_not_exist'
 
         expect(response).to be_successful
         expect(response.body).not_to match('RailsRoot mobile')

data/test/rails/overrides/spec/rails_helper.rb

@@ -48,7 +48,7 @@ RSpec.configure do |config|
   #       # ...
   #     end
   #
-  # The different available types are documented in the features, such as in
+  # The different available types are documented in the system, such as in
   # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!
 

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

@@ -0,0 +1,106 @@
+require 'system_helper'
+
+describe 'jpmobile integration spec', type: :request do
+  include Jpmobile::Util
+
+  before do
+    page.driver.headers = { 'User-Agent' => user_agent }
+  end
+
+  shared_examples_for '文字コードフィルタが動作しているとき' do
+    it 'はhtml以外は変換しないこと' do
+      get "/#{controller}/rawdata", env: { 'HTTP_USER_AGENT' => user_agent }
+      expect(response.body.encode('UTF-8')).to eq('アブラカダブラ')
+      expect(response.headers['Content-Type']).not_to match(/charset/i)
+    end
+  end
+
+  #
+  # PCからのアクセス
+  #
+  describe FilterController do
+    let(:controller) { 'filter' }
+
+    describe 'PCからのアクセス' do
+      let(:user_agent) do
+        '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
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    describe 'DoCoMo SH902i からのアクセス' do
+      let(:user_agent) do
+        'DoCoMo/2.0 SH902i(c100;TB;W24H12)'
+      end
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    describe 'au CA32 からのアクセス' do
+      let(:user_agent) do
+        'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0'
+      end
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    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'
+      end
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    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'
+      end
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+  end
+
+  describe HankakuFilterController do
+    let(:controller) { 'hankaku_filter' }
+
+    describe 'PCからのアクセス' do
+      let(:user_agent) do
+        '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
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    describe 'DoCoMo SH902i からのアクセス' do
+      let(:user_agent) do
+        'DoCoMo/2.0 SH902i(c100;TB;W24H12)'
+      end
+
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    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'
+      end
+
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+  end
+
+  describe HankakuInputFilterController do
+    let(:controller) { 'hankaku_input_filter' }
+
+    describe 'DoCoMo SH902i からのアクセス' do
+      let(:user_agent) do
+        'DoCoMo/2.0 SH902i(c100;TB;W24H12)'
+      end
+
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+
+    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'
+      end
+
+      it_should_behave_like '文字コードフィルタが動作しているとき'
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe TemplatePathController, 'integrated_views', type: :request do
   before do
-    page.driver.header('User-Agent', user_agent)
+    page.driver.headers = { 'User-Agent' => user_agent }
   end
 
   describe 'index' do

data/test/rails/overrides/spec/{features → system}/admin/top_spec.rb

@@ -1,9 +1,9 @@
-require 'rails_helper'
+require 'system_helper'
 
 describe Admin::TopController, type: :feature do
   describe "GET 'full_path'" do
     before do
-      page.driver.header('user_agent', user_agent)
+      page.driver.headers = { 'User-Agent' => user_agent }
     end
 
     context 'PCからのアクセスの場合' do

data/test/rails/overrides/spec/{features → system}/filter_spec.rb

@@ -1,10 +1,10 @@
-require 'rails_helper'
+require 'system_helper'
 
 describe 'jpmobile integration spec', type: :feature do
   include Jpmobile::Util
 
   before do
-    page.driver.header('User-Agent', user_agent)
+    page.driver.headers = { 'User-Agent' => user_agent }
   end
 
   shared_examples_for 'hankaku_filter input: true のとき' do
@@ -38,11 +38,6 @@ describe 'jpmobile integration spec', type: :feature do
   end
 
   shared_examples_for '文字コードフィルタが動作しているとき' do
-    it 'はhtml以外は変換しないこと' do
-      visit "/#{controller}/rawdata"
-      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"
       expect(page.response_headers['Content-Type']).to match(/utf-8/i)

data/test/rails/overrides/spec/system/support/cuprite_setup.rb

@@ -0,0 +1,14 @@
+require 'capybara/cuprite'
+
+Capybara.register_driver(:cuprite) do |app|
+  Capybara::Cuprite::Driver.new(
+    app,
+    **{
+      window_size: [1200, 800],
+      browser_options: {},
+      inspector: true,
+    },
+  )
+end
+
+Capybara.default_driver = Capybara.javascript_driver = :cuprite

data/test/rails/overrides/spec/system_helper.rb

@@ -0,0 +1,3 @@
+require 'rails_helper'
+
+Dir[File.join(__dir__, 'system/support/**/*.rb')].sort.each {|file| require file }