Skip to content
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.

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

Readds Custom Variables as submodule #16104

Merged
merged 6 commits into from Jun 29, 2020
Merged

Readds Custom Variables as submodule #16104

merged 6 commits into from Jun 29, 2020

Conversation

sgiehl
Copy link
Member

@sgiehl sgiehl commented Jun 23, 2020

This PR is based on #16090 and should be merged into it before merging it.

Reason for having two PRs is to check that Matomo (the tests) are running without the plugin (see build results from #16090). That's important to prove Matomo 4 will also run without the plugin being installed at all. This PR readds the plugin as a submodule and updates the expected test files again...

Note: Some submodule plugin tests are still failing and should be updated when merging...

@sgiehl sgiehl added not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. Needs Review PRs that need a code review labels Jun 23, 2020
@sgiehl sgiehl added this to the 4.0.0 milestone Jun 23, 2020
@diosmosis
Copy link
Member

Is there a reason to even keep it as a submodule for 4.0?

@tsteur
Copy link
Member

tsteur commented Jun 25, 2020

Yes we're still supporting it for a while

Copy link
Member

@diosmosis diosmosis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some submodule test failures, but looks good

@sgiehl sgiehl merged commit f886abf into 11524-cvar Jun 29, 2020
@sgiehl sgiehl deleted the 11524-cvar-readd branch June 29, 2020 08:54
sgiehl added a commit that referenced this pull request Jul 1, 2020
* Removes CustomVariables plugin

* removes CustomVariables plugin from core list

* Move methods to get custom variables from request to the plugin

* define visit fields to persist in plugin

* do not use custom variables plugin if not available

* adjust test requirements for CustomVariables plugin

* Only execute update if plugin is installed

* do not consider custom variables widget as api in tests

* move autosuggest tests for custom variables to plugin

* do not use custom variable segments in core tests

* move multi column segment test to custom variables plugin

* do not use custom variable segment in archive cron test

* update access log to use new product view parameters instead of custom variables

* move some custom variables based tests to plugin

* Use Contents API instead of CustomVariables for CSV export tests

* skip some tests if CustomVariables plugin is not available

* Adjust tracker code generator tests to work without custom variables plugin

* [TEMP] remove custom variables from system test output

* adjust some tests to run without custom variables plugin

* apply some review feedback

* Readds Custom Variables as submodule (#16104)

* Adds CustomVariables as submodule

* Revert "[TEMP] remove custom variables from system test output"

This reverts commit 30b56dc.

* use submodule branch

* test changes due to loading CustomVariables as submodule (plugin order)

* updates some expected screenshots

* improve test fixture

* submodule update
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Needs Review PRs that need a code review not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants