jpmobile 4.1.1 → 4.1.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/jpmobile.gemspec +2 -0
- data/lib/jpmobile/emoticon.rb +3 -3
- data/lib/jpmobile/filter.rb +1 -1
- data/lib/jpmobile/mail.rb +3 -3
- data/lib/jpmobile/mobile/abstract_mobile.rb +5 -2
- data/lib/jpmobile/resolver.rb +17 -1
- data/lib/jpmobile/version.rb +1 -1
- data/lib/tasks/jpmobile_tasks.rake +5 -11
- data/spec/rack/jpmobile/android_spec.rb +4 -4
- data/spec/rack/jpmobile/au_spec.rb +46 -46
- data/spec/rack/jpmobile/black_berry_spec.rb +4 -4
- data/spec/rack/jpmobile/docomo_spec.rb +52 -52
- data/spec/rack/jpmobile/emoticon_spec.rb +67 -67
- data/spec/rack/jpmobile/filter_spec.rb +36 -36
- data/spec/rack/jpmobile/iphone_spec.rb +5 -5
- data/spec/rack/jpmobile/mobile_by_ua_spec.rb +2 -2
- data/spec/rack/jpmobile/params_filter_spec.rb +30 -30
- data/spec/rack/jpmobile/softbank_spec.rb +39 -39
- data/spec/rack/jpmobile/willcom_spec.rb +12 -12
- data/spec/rack/jpmobile/windows_phone.rb +4 -4
- data/spec/unit/decorated_mail_spec.rb +3 -3
- data/spec/unit/email_spec.rb +6 -6
- data/spec/unit/emoticon_spec.rb +33 -33
- data/spec/unit/encoding_spec.rb +14 -14
- data/spec/unit/is_carrier_spec.rb +1 -1
- data/spec/unit/mail_spec.rb +63 -63
- data/spec/unit/mobile/iphone_spec.rb +6 -6
- data/spec/unit/receive_mail_spec.rb +75 -75
- data/spec/unit/util_spec.rb +34 -34
- data/spec/unit/valid_ip_spec.rb +2 -2
- data/spec/unit/variants_spec.rb +40 -10
- data/test/rails/overrides/Gemfile +3 -3
- data/test/rails/overrides/spec/controllers/docomo_guid_spec.rb +6 -6
- data/test/rails/overrides/spec/controllers/helpers_spec.rb +22 -22
- data/test/rails/overrides/spec/controllers/mobile_spec_controller_spec.rb +19 -19
- data/test/rails/overrides/spec/controllers/template_path_spec.rb +8 -8
- data/test/rails/overrides/spec/controllers/trans_sid_controller_spec.rb +2 -2
- data/test/rails/overrides/spec/features/admin/top_spec.rb +3 -3
- data/test/rails/overrides/spec/features/filter_spec.rb +32 -32
- data/test/rails/overrides/spec/helpers/helpers_spec.rb +3 -3
- data/test/rails/overrides/spec/mailers/decorated_mailer_spec.rb +3 -3
- data/test/rails/overrides/spec/mailers/mobile_mailer_spec.rb +179 -179
- data/test/rails/overrides/spec/mailers/normal_mailer_spec.rb +7 -7
- data/test/rails/overrides/spec/requests/docomo_spec.rb +6 -6
- data/test/rails/overrides/spec/requests/emobile_spec.rb +6 -6
- data/test/rails/overrides/spec/requests/pc_spec.rb +3 -3
- data/test/rails/overrides/spec/requests/softbank_emulator_spec.rb +6 -6
- data/test/rails/overrides/spec/requests/template_path_spec.rb +24 -24
- data/test/rails/overrides/spec/requests/trans_sid_spec.rb +16 -16
- metadata +39 -25
@@ -30,23 +30,23 @@ describe "絵文字が" do
|
|
30
30
|
|
31
31
|
it "docomo 絵文字が変換されないこと" do
|
32
32
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
|
33
|
-
response_body(response).
|
33
|
+
expect(response_body(response)).to eq(@docomo_cr)
|
34
34
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
|
35
|
-
response_body(response).
|
35
|
+
expect(response_body(response)).to eq(@docomo_utf8)
|
36
36
|
end
|
37
37
|
|
38
38
|
it "au 絵文字が変換されないこと" do
|
39
39
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
|
40
|
-
response_body(response).
|
40
|
+
expect(response_body(response)).to eq(@au_cr)
|
41
41
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
|
42
|
-
response_body(response).
|
42
|
+
expect(response_body(response)).to eq(@au_utf8)
|
43
43
|
end
|
44
44
|
|
45
45
|
it "softbank 絵文字が変換されないこと" do
|
46
46
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
|
47
|
-
response_body(response).
|
47
|
+
expect(response_body(response)).to eq(@softbank_cr)
|
48
48
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
|
49
|
-
response_body(response).
|
49
|
+
expect(response_body(response)).to eq(@softbank_utf8)
|
50
50
|
end
|
51
51
|
end
|
52
52
|
|
@@ -69,43 +69,43 @@ describe "絵文字が" do
|
|
69
69
|
end
|
70
70
|
|
71
71
|
it "Jpmobile::Emoticon.pc_emoticon? がtrueになること" do
|
72
|
-
Jpmobile::Emoticon.pc_emoticon
|
72
|
+
expect(Jpmobile::Emoticon.pc_emoticon?).to be_truthy
|
73
73
|
end
|
74
74
|
|
75
75
|
it "docomo 絵文字が画像に変換されること" do
|
76
76
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
|
77
|
-
response_body(response).
|
77
|
+
expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
|
78
78
|
end
|
79
79
|
|
80
80
|
it "docomo 絵文字コードが画像に変換されること" do
|
81
81
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
|
82
|
-
response_body(response).
|
82
|
+
expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
|
83
83
|
end
|
84
84
|
|
85
85
|
it "au 絵文字が画像に変換されること" do
|
86
86
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
|
87
|
-
response_body(response).
|
87
|
+
expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
|
88
88
|
end
|
89
89
|
|
90
90
|
it "au 絵文字コードが画像に変換されること" do
|
91
91
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
|
92
|
-
response_body(response).
|
92
|
+
expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
|
93
93
|
end
|
94
94
|
|
95
95
|
it "softbank 絵文字が画像に変換されること" do
|
96
96
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
|
97
|
-
response_body(response).
|
97
|
+
expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
|
98
98
|
end
|
99
99
|
|
100
100
|
it "softbank 絵文字コードが画像に変換されること" do
|
101
101
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
|
102
|
-
response_body(response).
|
102
|
+
expect(response_body(response)).to eq("<img src=\"#{@path}/sun.gif\" alt=\"sun\" />")
|
103
103
|
end
|
104
104
|
|
105
105
|
it "Content-Type が変換できないものである場合には変換しないこと" do
|
106
106
|
@res = Rack::MockRequest.env_for("/", 'Content-Type' => 'image/jpeg')
|
107
107
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
|
108
|
-
response_body(response).
|
108
|
+
expect(response_body(response)).to eq(@softbank_utf8)
|
109
109
|
end
|
110
110
|
end
|
111
111
|
|
@@ -119,26 +119,26 @@ describe "絵文字が" do
|
|
119
119
|
|
120
120
|
it "docomo 絵文字が変換されること" do
|
121
121
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
|
122
|
-
response_body(response).
|
122
|
+
expect(response_body(response)).to eq(sjis("\xf8\x9f"))
|
123
123
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
|
124
|
-
response_body(response).
|
124
|
+
expect(response_body(response)).to eq(sjis("\xf8\x9f"))
|
125
125
|
|
126
126
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
|
127
|
-
response_body(response).
|
127
|
+
expect(response_body(response)).to eq(sjis("\xf9\x79"))
|
128
128
|
end
|
129
129
|
|
130
130
|
it "au 絵文字が変換されること" do
|
131
131
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
|
132
|
-
response_body(response).
|
132
|
+
expect(response_body(response)).to eq(sjis("\xf8\x9f"))
|
133
133
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
|
134
|
-
response_body(response).
|
134
|
+
expect(response_body(response)).to eq(sjis("\xf8\x9f"))
|
135
135
|
end
|
136
136
|
|
137
137
|
it "softbank 絵文字が変換されること" do
|
138
138
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
|
139
|
-
response_body(response).
|
139
|
+
expect(response_body(response)).to eq(sjis("\xf8\x9f"))
|
140
140
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
|
141
|
-
response_body(response).
|
141
|
+
expect(response_body(response)).to eq(sjis("\xf8\x9f"))
|
142
142
|
end
|
143
143
|
|
144
144
|
it "パラメータが変換されること" do
|
@@ -151,8 +151,8 @@ describe "絵文字が" do
|
|
151
151
|
'Content-Type' => 'text/html; charset=utf-8')
|
152
152
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
|
153
153
|
req = Rack::Request.new(res[1])
|
154
|
-
req.params['q'].
|
155
|
-
response_body(res).
|
154
|
+
expect(req.params['q']).to eq(utf8("\xee\x98\xbe"))
|
155
|
+
expect(response_body(res)).to eq(sjis("\xf8\x9f"))
|
156
156
|
end
|
157
157
|
end
|
158
158
|
|
@@ -166,26 +166,26 @@ describe "絵文字が" do
|
|
166
166
|
|
167
167
|
it "docomo 絵文字が変換されること" do
|
168
168
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
|
169
|
-
response_body(response).
|
169
|
+
expect(response_body(response)).to eq(sjis("\xf6\x60"))
|
170
170
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
|
171
|
-
response_body(response).
|
171
|
+
expect(response_body(response)).to eq(sjis("\xf6\x60"))
|
172
172
|
|
173
173
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
|
174
|
-
response_body(response).
|
174
|
+
expect(response_body(response)).to eq(utf8_to_sjis("[ドコモポイント]"))
|
175
175
|
end
|
176
176
|
|
177
177
|
it "au 絵文字が変換されること" do
|
178
178
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
|
179
|
-
response_body(response).
|
179
|
+
expect(response_body(response)).to eq(sjis("\xf6\x60"))
|
180
180
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
|
181
|
-
response_body(response).
|
181
|
+
expect(response_body(response)).to eq(sjis("\xf6\x60"))
|
182
182
|
end
|
183
183
|
|
184
184
|
it "softbank 絵文字が変換されること" do
|
185
185
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
|
186
|
-
response_body(response).
|
186
|
+
expect(response_body(response)).to eq(sjis("\xf6\x60"))
|
187
187
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
|
188
|
-
response_body(response).
|
188
|
+
expect(response_body(response)).to eq(sjis("\xf6\x60"))
|
189
189
|
end
|
190
190
|
|
191
191
|
it "パラメータが変換されること" do
|
@@ -198,8 +198,8 @@ describe "絵文字が" do
|
|
198
198
|
'Content-Type' => 'text/html; charset=utf-8')
|
199
199
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
|
200
200
|
req = Rack::Request.new(res[1])
|
201
|
-
req.params['q'].
|
202
|
-
response_body(res).
|
201
|
+
expect(req.params['q']).to eq([0xe488].pack("U"))
|
202
|
+
expect(response_body(res)).to eq(sjis("\xf6\x60"))
|
203
203
|
end
|
204
204
|
end
|
205
205
|
|
@@ -213,26 +213,26 @@ describe "絵文字が" do
|
|
213
213
|
|
214
214
|
it "docomo 絵文字が変換されること" do
|
215
215
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_cr))).call(@res)[2]
|
216
|
-
response_body(response).
|
216
|
+
expect(response_body(response)).to eq([0xe04a].pack('U'))
|
217
217
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_utf8))).call(@res)[2]
|
218
|
-
response_body(response).
|
218
|
+
expect(response_body(response)).to eq([0xe04a].pack('U'))
|
219
219
|
|
220
220
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@docomo_docomopoint))).call(@res)[2]
|
221
|
-
response_body(response).
|
221
|
+
expect(response_body(response)).to eq("[ドコモポイント]")
|
222
222
|
end
|
223
223
|
|
224
224
|
it "au 絵文字が変換されること" do
|
225
225
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_cr))).call(@res)[2]
|
226
|
-
response_body(response).
|
226
|
+
expect(response_body(response)).to eq([0xe04a].pack('U'))
|
227
227
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@au_utf8))).call(@res)[2]
|
228
|
-
response_body(response).
|
228
|
+
expect(response_body(response)).to eq([0xe04a].pack('U'))
|
229
229
|
end
|
230
230
|
|
231
231
|
it "softbank 絵文字が変換されること" do
|
232
232
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
|
233
|
-
response_body(response).
|
233
|
+
expect(response_body(response)).to eq([0xe04a].pack('U'))
|
234
234
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
|
235
|
-
response_body(response).
|
235
|
+
expect(response_body(response)).to eq([0xe04a].pack('U'))
|
236
236
|
end
|
237
237
|
|
238
238
|
it "パラメータが変換されること" do
|
@@ -245,8 +245,8 @@ describe "絵文字が" do
|
|
245
245
|
'Content-Type' => 'text/html; charset=utf-8')
|
246
246
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
|
247
247
|
req = Rack::Request.new(res[1])
|
248
|
-
req.params['q'].
|
249
|
-
response_body(res).
|
248
|
+
expect(req.params['q']).to eq([0xf04a].pack("U"))
|
249
|
+
expect(response_body(res)).to eq([0xe04a].pack('U'))
|
250
250
|
end
|
251
251
|
end
|
252
252
|
|
@@ -260,9 +260,9 @@ describe "絵文字が" do
|
|
260
260
|
|
261
261
|
it "softbank 絵文字が変換されること" do
|
262
262
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
|
263
|
-
response_body(response).
|
263
|
+
expect(response_body(response)).to eq([0xe04a].pack('U'))
|
264
264
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
|
265
|
-
response_body(response).
|
265
|
+
expect(response_body(response)).to eq([0xe04a].pack('U'))
|
266
266
|
end
|
267
267
|
|
268
268
|
it "パラメータが変換されること" do
|
@@ -275,8 +275,8 @@ describe "絵文字が" do
|
|
275
275
|
'Content-Type' => 'text/html; charset=utf-8')
|
276
276
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
|
277
277
|
req = Rack::Request.new(res[1])
|
278
|
-
req.params['q'].
|
279
|
-
response_body(res).
|
278
|
+
expect(req.params['q']).to eq([0xf04a].pack("U"))
|
279
|
+
expect(response_body(res)).to eq([0xe04a].pack('U'))
|
280
280
|
end
|
281
281
|
end
|
282
282
|
|
@@ -291,9 +291,9 @@ describe "絵文字が" do
|
|
291
291
|
|
292
292
|
it 'should convert Softbank emoticon' do
|
293
293
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_cr))).call(@res)[2]
|
294
|
-
response_body(response).
|
294
|
+
expect(response_body(response)).to eq([0xe04a].pack('U'))
|
295
295
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@softbank_utf8))).call(@res)[2]
|
296
|
-
response_body(response).
|
296
|
+
expect(response_body(response)).to eq([0xe04a].pack('U'))
|
297
297
|
end
|
298
298
|
|
299
299
|
it "converts query parameters" do
|
@@ -306,13 +306,13 @@ describe "絵文字が" do
|
|
306
306
|
'Content-Type' => 'text/html; charset=utf-8')
|
307
307
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
|
308
308
|
req = Rack::Request.new(res[1])
|
309
|
-
req.params['q'].
|
310
|
-
response_body(res).
|
309
|
+
expect(req.params['q']).to eq([0xf04a].pack("U"))
|
310
|
+
expect(response_body(res)).to eq([0xe04a].pack('U'))
|
311
311
|
end
|
312
312
|
|
313
313
|
it 'should not convert 〓' do
|
314
314
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
|
315
|
-
response_body(response).
|
315
|
+
expect(response_body(response)).to eq('〓')
|
316
316
|
end
|
317
317
|
end
|
318
318
|
|
@@ -328,9 +328,9 @@ describe "絵文字が" do
|
|
328
328
|
|
329
329
|
it "should convert Unicode emoticon" do
|
330
330
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@unicode_single))).call(@res)[2]
|
331
|
-
response_body(response).
|
331
|
+
expect(response_body(response)).to eq([0x2600].pack('U*'))
|
332
332
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@unicode_multi))).call(@res)[2]
|
333
|
-
response_body(response).
|
333
|
+
expect(response_body(response)).to eq([0x26C5].pack('U*'))
|
334
334
|
end
|
335
335
|
|
336
336
|
it "converts query parameters" do
|
@@ -343,13 +343,13 @@ describe "絵文字が" do
|
|
343
343
|
'Content-Type' => 'text/html; charset=utf-8')
|
344
344
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
|
345
345
|
req = Rack::Request.new(res[1])
|
346
|
-
req.params['q'].
|
347
|
-
response_body(res).
|
346
|
+
expect(req.params['q']).to eq([0x26C5].pack("U"))
|
347
|
+
expect(response_body(res)).to eq([0x26C5].pack('U'))
|
348
348
|
end
|
349
349
|
|
350
350
|
it 'should not convert 〓' do
|
351
351
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
|
352
|
-
response_body(response).
|
352
|
+
expect(response_body(response)).to eq('〓')
|
353
353
|
end
|
354
354
|
end
|
355
355
|
end
|
@@ -370,9 +370,9 @@ describe "絵文字が" do
|
|
370
370
|
|
371
371
|
it "should convert Google emoticon" do
|
372
372
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
|
373
|
-
response_body(response).
|
373
|
+
expect(response_body(response)).to eq([0xFE000].pack('U*'))
|
374
374
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
|
375
|
-
response_body(response).
|
375
|
+
expect(response_body(response)).to eq([0xFE00F].pack('U*'))
|
376
376
|
end
|
377
377
|
|
378
378
|
it "converts query parameters irreversibly" do
|
@@ -385,13 +385,13 @@ describe "絵文字が" do
|
|
385
385
|
'Content-Type' => 'text/html; charset=utf-8')
|
386
386
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
|
387
387
|
req = Rack::Request.new(res[1])
|
388
|
-
req.params['q'].
|
389
|
-
response_body(res).
|
388
|
+
expect(req.params['q']).to eq([0xe63e, 0xe63f].pack("U*"))
|
389
|
+
expect(response_body(res)).to eq([0xfe000, 0xfe001].pack("U*"))
|
390
390
|
end
|
391
391
|
|
392
392
|
it 'should not convert 〓' do
|
393
393
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
|
394
|
-
response_body(response).
|
394
|
+
expect(response_body(response)).to eq('〓')
|
395
395
|
end
|
396
396
|
end
|
397
397
|
|
@@ -405,9 +405,9 @@ describe "絵文字が" do
|
|
405
405
|
|
406
406
|
it "should convert Google emoticon" do
|
407
407
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_single))).call(@res)[2]
|
408
|
-
response_body(response).
|
408
|
+
expect(response_body(response)).to eq([0xFE000].pack('U*'))
|
409
409
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@google_multi))).call(@res)[2]
|
410
|
-
response_body(response).
|
410
|
+
expect(response_body(response)).to eq([0xFE00F].pack('U*'))
|
411
411
|
end
|
412
412
|
|
413
413
|
it "converts query parameters irreversibly" do
|
@@ -420,13 +420,13 @@ describe "絵文字が" do
|
|
420
420
|
'Content-Type' => 'text/html; charset=utf-8')
|
421
421
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
|
422
422
|
req = Rack::Request.new(res[1])
|
423
|
-
req.params['q'].
|
424
|
-
response_body(res).
|
423
|
+
expect(req.params['q']).to eq([0xe63e, 0xe63f].pack("U*"))
|
424
|
+
expect(response_body(res)).to eq([0xfe000, 0xfe001].pack("U*"))
|
425
425
|
end
|
426
426
|
|
427
427
|
it 'should not convert 〓' do
|
428
428
|
response = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('〓'))).call(@res)[2]
|
429
|
-
response_body(response).
|
429
|
+
expect(response_body(response)).to eq('〓')
|
430
430
|
end
|
431
431
|
|
432
432
|
it 'should convert unsupported emoticon to "〓"' do
|
@@ -439,8 +439,8 @@ describe "絵文字が" do
|
|
439
439
|
'Content-Type' => 'text/html; charset=utf-8')
|
440
440
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::ParamsFilter.new(Jpmobile::Rack::Filter.new(RenderParamApp.new))).call(res)
|
441
441
|
req = Rack::Request.new(res[1])
|
442
|
-
req.params['q'].
|
443
|
-
response_body(res).
|
442
|
+
expect(req.params['q']).to eq('〓')
|
443
|
+
expect(response_body(res)).to eq('〓')
|
444
444
|
end
|
445
445
|
end
|
446
446
|
end
|
@@ -19,8 +19,8 @@ describe Jpmobile::Rack::Filter do
|
|
19
19
|
'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
|
20
20
|
'Content-Type' => 'text/html; charset=utf-8')
|
21
21
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
|
22
|
-
res[1]['Content-Type'].
|
23
|
-
response_body(res).
|
22
|
+
expect(res[1]['Content-Type']).to eq("text/html; charset=Shift_JIS")
|
23
|
+
expect(response_body(res)).to eq(@sjis)
|
24
24
|
end
|
25
25
|
|
26
26
|
context "Content-Type" do
|
@@ -31,8 +31,8 @@ describe Jpmobile::Rack::Filter do
|
|
31
31
|
'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
|
32
32
|
'Content-Type' => 'application/xhtml+xml; charset=utf-8')
|
33
33
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
|
34
|
-
res[1]['Content-Type'].
|
35
|
-
response_body(res).
|
34
|
+
expect(res[1]['Content-Type']).to eq("application/xhtml+xml; charset=Shift_JIS")
|
35
|
+
expect(response_body(res)).to eq(@sjis)
|
36
36
|
end
|
37
37
|
|
38
38
|
it "が application/xml のときに変換されないこと" do
|
@@ -42,8 +42,8 @@ describe Jpmobile::Rack::Filter do
|
|
42
42
|
'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
|
43
43
|
'Content-Type' => 'application/xml; charset=utf-8')
|
44
44
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
|
45
|
-
res[1]['Content-Type'].
|
46
|
-
response_body(res).
|
45
|
+
expect(res[1]['Content-Type']).to eq("application/xml; charset=utf-8")
|
46
|
+
expect(response_body(res)).to eq(@utf8)
|
47
47
|
end
|
48
48
|
|
49
49
|
it "が image/jpeg のときに変換されないこと" do
|
@@ -53,8 +53,8 @@ describe Jpmobile::Rack::Filter do
|
|
53
53
|
'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
|
54
54
|
'Content-Type' => 'image/jpeg')
|
55
55
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
|
56
|
-
res[1]['Content-Type'].
|
57
|
-
response_body(res).
|
56
|
+
expect(res[1]['Content-Type']).to eq("image/jpeg")
|
57
|
+
expect(response_body(res)).to eq(@utf8)
|
58
58
|
end
|
59
59
|
|
60
60
|
it "が application/octet-stream のときに変換されないこと" do
|
@@ -64,8 +64,8 @@ describe Jpmobile::Rack::Filter do
|
|
64
64
|
'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
|
65
65
|
'Content-Type' => 'application/octet-stream')
|
66
66
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
|
67
|
-
res[1]['Content-Type'].
|
68
|
-
response_body(res).
|
67
|
+
expect(res[1]['Content-Type']).to eq("application/octet-stream")
|
68
|
+
expect(response_body(res)).to eq(@utf8)
|
69
69
|
end
|
70
70
|
|
71
71
|
it "が video/mpeg のときに変換されないこと" do
|
@@ -75,8 +75,8 @@ describe Jpmobile::Rack::Filter do
|
|
75
75
|
'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
|
76
76
|
'Content-Type' => 'video/mpeg')
|
77
77
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
|
78
|
-
res[1]['Content-Type'].
|
79
|
-
response_body(res).
|
78
|
+
expect(res[1]['Content-Type']).to eq("video/mpeg")
|
79
|
+
expect(response_body(res)).to eq(@utf8)
|
80
80
|
end
|
81
81
|
end
|
82
82
|
end
|
@@ -89,8 +89,8 @@ describe Jpmobile::Rack::Filter do
|
|
89
89
|
'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
|
90
90
|
'Content-Type' => 'text/html; charset=utf-8')
|
91
91
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
|
92
|
-
res[1]['Content-Type'].
|
93
|
-
response_body(res).
|
92
|
+
expect(res[1]['Content-Type']).to eq("text/html; charset=Shift_JIS")
|
93
|
+
expect(response_body(res)).to eq(@sjis)
|
94
94
|
end
|
95
95
|
end
|
96
96
|
|
@@ -102,8 +102,8 @@ describe Jpmobile::Rack::Filter do
|
|
102
102
|
'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1",
|
103
103
|
'Content-Type' => 'text/html; charset=utf-8')
|
104
104
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8))).call(res)
|
105
|
-
res[1]['Content-Type'].
|
106
|
-
response_body(res).
|
105
|
+
expect(res[1]['Content-Type']).to eq("text/html; charset=utf-8")
|
106
|
+
expect(response_body(res)).to eq(@utf8)
|
107
107
|
end
|
108
108
|
end
|
109
109
|
|
@@ -114,12 +114,12 @@ describe Jpmobile::Rack::Filter do
|
|
114
114
|
'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
|
115
115
|
'Content-Type' => 'text/html; charset=utf-8')
|
116
116
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('<input name="utf8" type="hidden" value="✓" />'))).call(req)
|
117
|
-
res[1]['Content-Type'].
|
118
|
-
response_body(res).
|
117
|
+
expect(res[1]['Content-Type']).to eq("text/html; charset=Shift_JIS")
|
118
|
+
expect(response_body(res)).to eq(" ")
|
119
119
|
|
120
120
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new('<input name="utf8" type="hidden" value="✓">'))).call(req)
|
121
|
-
res[1]['Content-Type'].
|
122
|
-
response_body(res).
|
121
|
+
expect(res[1]['Content-Type']).to eq("text/html; charset=Shift_JIS")
|
122
|
+
expect(response_body(res)).to eq(" ")
|
123
123
|
end
|
124
124
|
|
125
125
|
it "Nokogiri 経由の _snowman が出力されないこと" do
|
@@ -129,12 +129,12 @@ describe Jpmobile::Rack::Filter do
|
|
129
129
|
'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
|
130
130
|
'Content-Type' => 'text/html; charset=utf-8')
|
131
131
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new("<input name=\"utf8\" type=\"hidden\" value=\"#{[10003].pack("U")}\" />"))).call(req)
|
132
|
-
res[1]['Content-Type'].
|
133
|
-
response_body(res).
|
132
|
+
expect(res[1]['Content-Type']).to eq("text/html; charset=Shift_JIS")
|
133
|
+
expect(response_body(res)).to eq(" ")
|
134
134
|
|
135
135
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new("<input name=\"utf8\" type=\"hidden\" value=\"#{[10003].pack("U")}\">"))).call(req)
|
136
|
-
res[1]['Content-Type'].
|
137
|
-
response_body(res).
|
136
|
+
expect(res[1]['Content-Type']).to eq("text/html; charset=Shift_JIS")
|
137
|
+
expect(response_body(res)).to eq(" ")
|
138
138
|
end
|
139
139
|
end
|
140
140
|
|
@@ -162,7 +162,7 @@ describe Jpmobile::Rack::Filter do
|
|
162
162
|
'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
|
163
163
|
'Content-Type' => 'text/html; charset=utf-8')
|
164
164
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_cr))).call(res)
|
165
|
-
response_body(res).
|
165
|
+
expect(response_body(res)).to eq(@sjis + @docomo_emoji)
|
166
166
|
end
|
167
167
|
|
168
168
|
it "docomo のUTF-8絵文字が変換されること" do
|
@@ -172,7 +172,7 @@ describe Jpmobile::Rack::Filter do
|
|
172
172
|
'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
|
173
173
|
'Content-Type' => 'text/html; charset=utf-8')
|
174
174
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_utf8))).call(res)
|
175
|
-
response_body(res).
|
175
|
+
expect(response_body(res)).to eq(@sjis + @docomo_emoji)
|
176
176
|
end
|
177
177
|
|
178
178
|
it "au のUTF-8絵文字が変換されること" do
|
@@ -182,7 +182,7 @@ describe Jpmobile::Rack::Filter do
|
|
182
182
|
'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
|
183
183
|
'Content-Type' => 'text/html; charset=utf-8')
|
184
184
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_utf8))).call(res)
|
185
|
-
response_body(res).
|
185
|
+
expect(response_body(res)).to eq(@sjis + @docomo_emoji)
|
186
186
|
end
|
187
187
|
|
188
188
|
it "softbank のUTF-8絵文字が変換されること" do
|
@@ -192,7 +192,7 @@ describe Jpmobile::Rack::Filter do
|
|
192
192
|
'HTTP_USER_AGENT' => 'DoCoMo/2.0 SH906i(c100;TB;W24H16)',
|
193
193
|
'Content-Type' => 'text/html; charset=utf-8')
|
194
194
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_utf8))).call(res)
|
195
|
-
response_body(res).
|
195
|
+
expect(response_body(res)).to eq(@sjis + @docomo_emoji)
|
196
196
|
end
|
197
197
|
end
|
198
198
|
|
@@ -204,7 +204,7 @@ describe Jpmobile::Rack::Filter do
|
|
204
204
|
'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
|
205
205
|
'Content-Type' => 'text/html; charset=utf-8')
|
206
206
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_cr))).call(res)
|
207
|
-
response_body(res).
|
207
|
+
expect(response_body(res)).to eq(@sjis + @au_emoji)
|
208
208
|
end
|
209
209
|
|
210
210
|
it "docomo のUTF-8絵文字が変換されること" do
|
@@ -214,7 +214,7 @@ describe Jpmobile::Rack::Filter do
|
|
214
214
|
'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
|
215
215
|
'Content-Type' => 'text/html; charset=utf-8')
|
216
216
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_utf8))).call(res)
|
217
|
-
response_body(res).
|
217
|
+
expect(response_body(res)).to eq(@sjis + @au_emoji)
|
218
218
|
end
|
219
219
|
|
220
220
|
it "au のUTF-8絵文字が変換されること" do
|
@@ -224,7 +224,7 @@ describe Jpmobile::Rack::Filter do
|
|
224
224
|
'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
|
225
225
|
'Content-Type' => 'text/html; charset=utf-8')
|
226
226
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_utf8))).call(res)
|
227
|
-
response_body(res).
|
227
|
+
expect(response_body(res)).to eq(@sjis + @au_emoji)
|
228
228
|
end
|
229
229
|
|
230
230
|
it "softbank のUTF-8絵文字が変換されること" do
|
@@ -234,7 +234,7 @@ describe Jpmobile::Rack::Filter do
|
|
234
234
|
'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
|
235
235
|
'Content-Type' => 'text/html; charset=utf-8')
|
236
236
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_utf8))).call(res)
|
237
|
-
response_body(res).
|
237
|
+
expect(response_body(res)).to eq(@sjis + @au_emoji)
|
238
238
|
end
|
239
239
|
end
|
240
240
|
|
@@ -246,7 +246,7 @@ describe Jpmobile::Rack::Filter do
|
|
246
246
|
'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1",
|
247
247
|
'Content-Type' => 'text/html; charset=utf-8')
|
248
248
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_cr))).call(res)
|
249
|
-
response_body(res).
|
249
|
+
expect(response_body(res)).to eq(@utf8 + @softbank_emoji)
|
250
250
|
end
|
251
251
|
|
252
252
|
it "docomo のUTF-8絵文字が変換されること" do
|
@@ -256,7 +256,7 @@ describe Jpmobile::Rack::Filter do
|
|
256
256
|
'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1",
|
257
257
|
'Content-Type' => 'text/html; charset=utf-8')
|
258
258
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_docomo_utf8))).call(res)
|
259
|
-
response_body(res).
|
259
|
+
expect(response_body(res)).to eq(@utf8 + @softbank_emoji)
|
260
260
|
end
|
261
261
|
|
262
262
|
it "au のUTF-8絵文字が変換されること" do
|
@@ -266,7 +266,7 @@ describe Jpmobile::Rack::Filter do
|
|
266
266
|
'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1",
|
267
267
|
'Content-Type' => 'text/html; charset=utf-8')
|
268
268
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_au_utf8))).call(res)
|
269
|
-
response_body(res).
|
269
|
+
expect(response_body(res)).to eq(@utf8 + @softbank_emoji)
|
270
270
|
end
|
271
271
|
|
272
272
|
it "softbank のUTF-8絵文字が変換されること" do
|
@@ -276,7 +276,7 @@ describe Jpmobile::Rack::Filter do
|
|
276
276
|
'HTTP_USER_AGENT' => "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1",
|
277
277
|
'Content-Type' => 'text/html; charset=utf-8')
|
278
278
|
res = Jpmobile::Rack::MobileCarrier.new(Jpmobile::Rack::Filter.new(UnitApplication.new(@utf8 + @emoji_softbank_utf8))).call(res)
|
279
|
-
response_body(res).
|
279
|
+
expect(response_body(res)).to eq(@utf8 + @softbank_emoji)
|
280
280
|
end
|
281
281
|
end
|
282
282
|
end
|
@@ -11,10 +11,10 @@ describe Jpmobile::Rack::MobileCarrier, "iphone" do
|
|
11
11
|
'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')
|
12
12
|
env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
|
13
13
|
|
14
|
-
env['rack.jpmobile'].class.
|
15
|
-
env['rack.jpmobile'].position.
|
16
|
-
env['rack.jpmobile'].smart_phone
|
17
|
-
env['rack.jpmobile'].supports_cookie
|
14
|
+
expect(env['rack.jpmobile'].class).to eq(Jpmobile::Mobile::Iphone)
|
15
|
+
expect(env['rack.jpmobile'].position).to be_nil
|
16
|
+
expect(env['rack.jpmobile'].smart_phone?).to be_truthy
|
17
|
+
expect(env['rack.jpmobile'].supports_cookie?).to be_truthy
|
18
18
|
end
|
19
19
|
end
|
20
20
|
|
@@ -26,7 +26,7 @@ describe Jpmobile::Rack::MobileCarrier, "iphone" do
|
|
26
26
|
"REMOTE_ADDR"=>"202.179.204.1")
|
27
27
|
env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
|
28
28
|
|
29
|
-
env['rack.jpmobile'].valid_ip
|
29
|
+
expect(env['rack.jpmobile'].valid_ip?).to be_falsey
|
30
30
|
end
|
31
31
|
end
|
32
32
|
end
|
@@ -29,7 +29,7 @@ describe Jpmobile::Rack::MobileCarrier do
|
|
29
29
|
'http://jpmobile-rails.org/',
|
30
30
|
'HTTP_USER_AGENT' => user_agent)
|
31
31
|
env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
|
32
|
-
env['rack.jpmobile'].class.
|
32
|
+
expect(env['rack.jpmobile'].class).to eq(carrier)
|
33
33
|
end
|
34
34
|
end
|
35
35
|
|
@@ -38,6 +38,6 @@ describe Jpmobile::Rack::MobileCarrier do
|
|
38
38
|
'http://jpmobile-rails.org/',
|
39
39
|
'HTTP_USER_AGENT' => 'Googlebot')
|
40
40
|
env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
|
41
|
-
env['rack.jpmobile'].
|
41
|
+
expect(env['rack.jpmobile']).to be_nil
|
42
42
|
end
|
43
43
|
end
|