Skip to content

Moving jetpack_is_mobile into a package #16129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeherve merged 15 commits into from
Jun 25, 2020
Merged

Moving jetpack_is_mobile into a package #16129

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d1f5cd3
Moving jetpack_is_mobile into a package [not verified]
dero Jun 10, 2020
797dbc1
Add is_mobile tests [not verified]
dero Jun 16, 2020
99878a0
Add tests for UA returned value [not verified]
dero Jun 16, 2020
96545e4
Update the class comment and is_mobile method comments. [not verified]
dero Jun 16, 2020
5ea57ae
Rename Mobile package to Device Detection.
dero Jun 18, 2020
4a9724d
Rename Mobile to Device_Detection, implement get_info, update tests […
dero Jun 19, 2020
5b8bc41
Add shorthand methods, update tests. [not verified]
dero Jun 19, 2020
2965e8d
Update Device_Detection package README.
dero Jun 19, 2020
6108e07
Make User_Agent_Info park of Device_Detection package. [not verified]
dero Jun 19, 2020
45a2fdd
Address CR feedback.
dero Jun 22, 2020
acc31ff
[not verified] Merge branch 'master' into add/jetpack-mobile-package
gravityrail Jun 22, 2020
e336e87
[not verified] Restore master branch versions of unrelated files with…
gravityrail Jun 22, 2020
f74e9c9
Add the Jetpack_User_Agent_Info class back. Add deprecation notices.
dero Jun 23, 2020
86bc887
Merge branch 'add/jetpack-mobile-package' of github.com:Automattic/je…
dero Jun 23, 2020
b1f20eb
Use __METHOD__ instead of __FUNCTION__.
dero Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add tests for UA returned value [not verified]
  • Loading branch information
@dero
dero committed Jun 16, 2020
commit 99878a0f0653e02d3e713baeea130eaf5a7912ef
28 changes: 20 additions & 8 deletions packages/mobile/tests/php/test_Mobile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,31 @@ class Test_Mobile extends TestCase {
/**
* The is_mobile tests.
*
* @param string $ua User agent string.
* @param bool $expected_dumb Expected value for `dumb` mobile detection.
* @param bool $expected_smart Expected value for `smart` mobile detection.
* @param bool $expected_mobile Expected value for `any` mobile detection.
* @param string $ua User agent string.
* @param bool $expected_dumb Expected value for `dumb` mobile detection.
* @param bool $expected_smart Expected value for `smart` mobile detection.
* @param bool $expected_mobile Expected value for `any` mobile detection.
* @param bool $expected_ua_returned Expected value for UA returned by the method.
*
* @return void
*
* @dataProvider ua_provider
*/
public function test_is_mobile( $ua, $expected_dumb, $expected_smart, $expected_mobile ) {
public function test_is_mobile( $ua, $expected_dumb, $expected_smart, $expected_mobile, $expected_ua_returned ) {
$_SERVER['HTTP_USER_AGENT'] = $ua;

$dumb_test = Mobile::is_mobile( 'dumb', false );
$smart_test = Mobile::is_mobile( 'smart', false );
$mobile_test = Mobile::is_mobile( 'any', false );
$dumb_test = Mobile::is_mobile( 'dumb', false );
$smart_test = Mobile::is_mobile( 'smart', false );
$mobile_test = Mobile::is_mobile( 'any', false );
$mobile_test_ua = Mobile::is_mobile( 'any', true );

$this->assertEquals( $dumb_test, $expected_dumb );
$this->assertEquals( $smart_test, $expected_smart );
$this->assertEquals( $mobile_test, $expected_mobile );
$this->assertEquals( $mobile_test_ua, $expected_mobile ? $expected_ua_returned : false );
}


/**
* Data provider for test_is_mobile.
*
Expand All @@ -49,6 +53,7 @@ public function ua_provider() {
true,
false,
true,
'nokia',
),

// Samsung Galaxy S8 smart phone.
Expand All @@ -57,6 +62,7 @@ public function ua_provider() {
false,
true,
true,
'android',
),

// iPhone X smart phone.
Expand All @@ -65,6 +71,7 @@ public function ua_provider() {
false,
true,
true,
'iphone',
),

// iPad 2 10.5 tablet.
Expand All @@ -73,6 +80,7 @@ public function ua_provider() {
false,
false,
false, // not considered a mobile device, this is intended.
false,
),

// Kindle 3.
Expand All @@ -81,6 +89,7 @@ public function ua_provider() {
false,
true,
true,
'android',
),

// Huawei p20 smartphone.
Expand All @@ -89,6 +98,7 @@ public function ua_provider() {
false,
true,
true,
'android',
),

// Googlebot smartphone.
Expand All @@ -97,6 +107,7 @@ public function ua_provider() {
false,
true,
true,
'android',
),

// Googlebot desktop.
Expand All @@ -105,6 +116,7 @@ public function ua_provider() {
false,
false,
false,
false,
),
);
}
Expand Down