Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2020-04-19 16:52:29 +0300
committerGitHub <noreply@github.com>2020-04-19 16:52:29 +0300
commit7e6b13cfd9207adfd2ab0e3d39d0d3b8b17bb3ea (patch)
treec939395ab75eb1d2df66c352186f291f0f870d3f /plugins/UsersManager
parent36a3729bbe0c70175eeee61dbf23f3395800dfe9 (diff)
Run tests on bionic distribution & run AllTests with PHP 7.4 (#15720)
* run tests on php 7.4 / xenial * composer update * fix lfs check * adjust travis.yml * adds distribution param * update submodule * update travis.yml * fix icon tests * Fix array access error on PHP 7.4 * fix test * avoid usage of deprecated assertArraySubset * convert expectedException annotations * avoid error on php 7.4 * Use assertion instead of conditional expection * add separat expected test result asserialize output changed for PHP7.4 * updates expected ui files * fix ui test * run UI tests on xenial dist * updates expected ui files * Update core/DataTable/Renderer.php * updates expected UI files * submodule update
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r--plugins/UsersManager/tests/Integration/ModelTest.php18
-rw-r--r--plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png4
-rw-r--r--plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png4
-rw-r--r--plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png4
-rw-r--r--plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png4
5 files changed, 14 insertions, 20 deletions
diff --git a/plugins/UsersManager/tests/Integration/ModelTest.php b/plugins/UsersManager/tests/Integration/ModelTest.php
index b961e467ec..4c8ea750f1 100644
--- a/plugins/UsersManager/tests/Integration/ModelTest.php
+++ b/plugins/UsersManager/tests/Integration/ModelTest.php
@@ -152,21 +152,17 @@ class ModelTest extends IntegrationTestCase
)), $tokens);
}
- /**
- * @expectedException \Exception
- * @expectedExceptionMessage does not exist
- */
public function test_addTokenAuth_throwsException_ifUserNotExists()
{
+ $this->expectException(\Exception::class);
+ $this->expectExceptionMessage('does not exist');
$this->model->addTokenAuth('foobar', 'token', 'MyDescription', '2020-01-02 03:04:05', '2030-01-05 03:04:05');
}
- /**
- * @expectedException \Exception
- * @expectedExceptionMessage Duplicate entry
- */
public function test_addTokenAuth_throwsException_FailsAddingSameTwice()
{
+ $this->expectException(\Exception::class);
+ $this->expectExceptionMessage('Duplicate entry');
$this->model->addTokenAuth($this->login, 'token', 'My description', '2020-01-02 03:04:05');
$this->model->addTokenAuth($this->login, 'token', 'My duplicate', '2020-01-03 03:04:05');
}
@@ -179,12 +175,10 @@ class ModelTest extends IntegrationTestCase
$this->assertEquals(2, $id);
}
- /**
- * @expectedException \Exception
- * @expectedExceptionMessage General_ValidatorErrorEmptyValue
- */
public function test_addTokenAuth_throwsException_NoDescription()
{
+ $this->expectException(\Exception::class);
+ $this->expectExceptionMessage('General_ValidatorErrorEmptyValue');
$this->model->addTokenAuth($this->login, 'token', '', '2020-01-02 03:04:05');
}
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png
index 41c52b66b0..c9a7f11a6c 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_admin_view_edit_user_basic_info.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:3fe82c2879e2e593c2b3f55bd204e16cc3f5354162adc76f06eb246ca7f8fd11
-size 12440
+oid sha256:1e39fdcc54246fcf2ba49dac1e637f4eed79891666eb56236cb78eea49adc5b5
+size 12441
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
index 4fcc9d7525..1424e259f6 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_permissions_bulk_access_set.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:604165406d33bede16f4aebe0baec6739082387227fe8d62b2db4d1a275e2245
-size 108835
+oid sha256:3121775301b233a88ceefc0b3d7f50ee80365d01bc4f43a6665ff46f58ccb1f4
+size 108812
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png
index 03111ed718..3836957b92 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_set.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:0acacd81363d52994a9cfb1e47f7185e60b24be356ea4a8bb545089f7ac2a532
-size 36199
+oid sha256:6048de72d919a423500ee5dd956f54e60f9f26b9a27d307d5bcae60ab676e2ba
+size 36200
diff --git a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png
index 31d215e4df..094ce72e4f 100644
--- a/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png
+++ b/plugins/UsersManager/tests/UI/expected-screenshots/UsersManager_superuser_tab.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:ab0da6c86a912dd33cc177862a81b800cf2633243b1dcce90c3833f310d52dd6
-size 36101
+oid sha256:6035d3b1671db3ff0f684c778b2ffe517ae5fd5d2d776ef109669c6945d27902
+size 36103