diff options
Diffstat (limited to 'tests/PHPUnit/Fixtures/UITestFixture.php')
| -rw-r--r-- | tests/PHPUnit/Fixtures/UITestFixture.php | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tests/PHPUnit/Fixtures/UITestFixture.php b/tests/PHPUnit/Fixtures/UITestFixture.php index eb35b24114..34c63a22e9 100644 --- a/tests/PHPUnit/Fixtures/UITestFixture.php +++ b/tests/PHPUnit/Fixtures/UITestFixture.php @@ -8,6 +8,7 @@ namespace Piwik\Tests\Fixtures; use Exception; +use Piwik\API\Request; use Piwik\AssetManager; use Piwik\Access; use Piwik\Common; @@ -22,9 +23,6 @@ use Piwik\Plugins\UserCountry\LocationProvider; use Piwik\Plugins\UsersManager\API as UsersManagerAPI; use Piwik\Plugins\SitesManager\API as SitesManagerAPI; use Piwik\Tests\Framework\Fixture; -use Piwik\WidgetsList; -use Piwik\Tests\Framework\OverrideLogin; -use Piwik\Tests\Framework\TestCase\SystemTestCase; /** * Fixture for UI tests. @@ -222,10 +220,10 @@ class UITestFixture extends SqlDump $_GET['token_auth'] = Fixture::getTokenAuth(); // collect widgets & sort them so widget order is not important - $allWidgets = array(); - foreach (WidgetsList::get() as $category => $widgets) { - $allWidgets = array_merge($allWidgets, $widgets); - } + $allWidgets = Request::processRequest('API.getWidgetMetadata', array( + 'idSite' => 1 + )); + usort($allWidgets, function ($lhs, $rhs) { return strcmp($lhs['uniqueId'], $rhs['uniqueId']); }); @@ -290,11 +288,12 @@ class UITestFixture extends SqlDump $dashboard = array( array( array( - 'uniqueId' => "widgetVisitsSummarygetEvolutionGraphcolumnsArray", + 'uniqueId' => "widgetVisitsSummarygetEvolutionGraphforceView1viewDataTablegraphEvolution", 'parameters' => array( 'module' => 'VisitsSummary', 'action' => 'getEvolutionGraph', - 'columns' => 'nb_visits' + 'forceView' => '1', + 'viewDataTable' => 'graphEvolution' ) ) ), |