From 627cc829b452cd00805a9ea20bf5b0e09f780c22 Mon Sep 17 00:00:00 2001 From: mattab <matthieu.aubry@gmail.com> Date: Tue, 22 Sep 2015 10:56:49 +1200 Subject: [PATCH] Make Provider plugin disabled by default. fixes #8826 --- config/global.ini.php | 1 - core/Application/Kernel/PluginList.php | 3 ++- .../Integration/Commands/AnalyzeArchiveTableTest.php | 7 ++++--- plugins/Widgetize/tests/System/WidgetTest.php | 9 --------- tests/PHPUnit/Integration/WidgetsListTest.php | 3 ++- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/config/global.ini.php b/config/global.ini.php index 69930eddc1..fb07973354 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -751,7 +751,6 @@ Plugins[] = VisitTime Plugins[] = VisitorInterest Plugins[] = ExampleAPI Plugins[] = ExampleRssWidget -Plugins[] = Provider Plugins[] = Feedback Plugins[] = Monolog diff --git a/core/Application/Kernel/PluginList.php b/core/Application/Kernel/PluginList.php index 2c93253385..5d263a6ea3 100644 --- a/core/Application/Kernel/PluginList.php +++ b/core/Application/Kernel/PluginList.php @@ -38,7 +38,8 @@ class PluginList 'ExamplePluginTemplate', 'ExampleTracker', 'ExampleReport', - 'MobileAppMeasurable' + 'MobileAppMeasurable', + 'Provider' ); // Themes bundled with core package, disabled by default diff --git a/plugins/Diagnostics/Test/Integration/Commands/AnalyzeArchiveTableTest.php b/plugins/Diagnostics/Test/Integration/Commands/AnalyzeArchiveTableTest.php index 8d45a5095a..a60f0c0a19 100644 --- a/plugins/Diagnostics/Test/Integration/Commands/AnalyzeArchiveTableTest.php +++ b/plugins/Diagnostics/Test/Integration/Commands/AnalyzeArchiveTableTest.php @@ -14,6 +14,7 @@ use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI; /** * TODO: This could be a unit test if we could inject the ArchiveTableDao in the command + * @group AnalyzeArchiveTableTest */ class AnalyzeArchiveTableTest extends ConsoleCommandTestCase { @@ -40,12 +41,12 @@ Statistics for the archive_numeric_2010_03 and archive_blob_2010_03 tables: +-------------------------------------------+------------+---------------+-------------+---------+-----------+----------------+-------------+ | Group | # Archives | # Invalidated | # Temporary | # Error | # Segment | # Numeric Rows | # Blob Rows | +-------------------------------------------+------------+---------------+-------------+---------+-----------+----------------+-------------+ -| week[2010-03-01 - 2010-03-07] idSite = 1 | 3 | 0 | 0 | 0 | 2 | 36 | 64 | -| month[2010-03-01 - 2010-03-31] idSite = 1 | 3 | 0 | 0 | 0 | 2 | 36 | 64 | +| week[2010-03-01 - 2010-03-07] idSite = 1 | 3 | 0 | 0 | 0 | 2 | 36 | 63 | +| month[2010-03-01 - 2010-03-31] idSite = 1 | 3 | 0 | 0 | 0 | 2 | 36 | 63 | | day[2010-03-03 - 2010-03-03] idSite = 1 | 3 | 0 | 0 | 0 | 2 | 0 | 0 | | day[2010-03-04 - 2010-03-04] idSite = 1 | 3 | 0 | 0 | 0 | 2 | 0 | 0 | | day[2010-03-05 - 2010-03-05] idSite = 1 | 3 | 0 | 0 | 0 | 2 | 0 | 0 | -| day[2010-03-06 - 2010-03-06] idSite = 1 | 3 | 0 | 0 | 0 | 2 | 36 | 52 | +| day[2010-03-06 - 2010-03-06] idSite = 1 | 3 | 0 | 0 | 0 | 2 | 36 | 51 | | day[2010-03-07 - 2010-03-07] idSite = 1 | 3 | 0 | 0 | 0 | 2 | 0 | 0 | | day[2010-03-08 - 2010-03-08] idSite = 1 | 3 | 0 | 0 | 0 | 2 | 0 | 0 | | week[2010-03-08 - 2010-03-14] idSite = 1 | 3 | 0 | 0 | 0 | 2 | 0 | 0 | diff --git a/plugins/Widgetize/tests/System/WidgetTest.php b/plugins/Widgetize/tests/System/WidgetTest.php index cd408c37c2..d2d6ec3260 100644 --- a/plugins/Widgetize/tests/System/WidgetTest.php +++ b/plugins/Widgetize/tests/System/WidgetTest.php @@ -301,15 +301,6 @@ class WidgetTest extends SystemTestCase 'action' => 'getNumberOfVisitsByDaysSinceLast', ), ), - array ( - 'name' => 'Providers', - 'uniqueId' => 'widgetProvidergetProvider', - 'parameters' => - array ( - 'module' => 'Provider', - 'action' => 'getProvider', - ), - ), array ( 'name' => 'Frequency Overview', 'uniqueId' => 'widgetVisitFrequencygetSparklines', diff --git a/tests/PHPUnit/Integration/WidgetsListTest.php b/tests/PHPUnit/Integration/WidgetsListTest.php index fdf58a366f..f741f813f3 100644 --- a/tests/PHPUnit/Integration/WidgetsListTest.php +++ b/tests/PHPUnit/Integration/WidgetsListTest.php @@ -16,6 +16,7 @@ use Piwik\Tests\Framework\Fixture; use Piwik\Tests\Framework\TestCase\IntegrationTestCase; /** + * @group WidgetsListTest * @group Core */ class WidgetsListTest extends IntegrationTestCase @@ -37,7 +38,7 @@ class WidgetsListTest extends IntegrationTestCase $numberOfWidgets = array( 'VisitsSummary_VisitsSummary' => 6, 'Live!' => 4, - 'General_Visitors' => 12, + 'General_Visitors' => 11, 'General_VisitorSettings' => 5, 'General_Actions' => 10, 'Events_Events' => 3, -- GitLab