Faster tests on Piwik 3 branch #10047
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…me map when displayed on a page
…cted To the Piwik\Plugins\Login\Controller class: This change is to prevent extending classes (third-party login plugins reusing the core Login plugin implementation) from having to copy-paste \Login\Controller code which, if declared "private" cannot be part of the child class. Please refer to #8681 for details - that PR, which is an exact copy, was merged into the Piwik 2.x branch, but then reverted to not break existing plugins. It was decided to do that on the 3.x branch instead, which this PR does.
Merge master => 3.0
Merge master => 3.0
Conflicts: CHANGELOG.md composer.json core/Version.php core/WidgetsList.php lang/sq.json lang/tr.json plugins/API/API.php plugins/CoreHome/Widgets.php plugins/CoreHome/javascripts/corehome.js plugins/CoreHome/javascripts/menu_init.js plugins/CoreHome/javascripts/top_controls.js plugins/CoreHome/lang/en.json plugins/CoreHome/stylesheets/layout.less plugins/CoreHome/templates/_menu.twig plugins/Dashboard/Dashboard.php plugins/Dashboard/javascripts/dashboardObject.js plugins/ExampleRssWidget/Widgets/RssChangelog.php plugins/Goals/templates/getGoalReportView.twig tests/PHPUnit/Integration/WidgetsListTest.php tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
Merge 3.0 => 3.x-dev
Conflicts: core/Version.php core/WidgetsList.php plugins/CustomDimensions plugins/Goals/templates/getGoalReportView.twig plugins/Goals/templates/getOverviewView.twig tests/UI/expected-ui-screenshots
Merge master => 3.0
Merge user and admin menu to one single menu
Remove magic quote hacks as now PHP 5.5 is required
New Settings APIs, let plugins define the fields of a SitesManager, better SitesManager UI
Conflicts: core/Version.php tests/UI/expected-ui-screenshots tests/lib/screenshot-testing/support/chai-extras.js
tsteur
added
the
not-in-changelog
|
issued against wrong branch 👎 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The last PR made tests twice as slow. This PR makes it fast again as it was before.
BTW: It looks like each UI test job runs 10 mins faster on Piwik 3 branch compared to Piwik 2 but could be also due to travis servers (but doesn't look like it).