diff options
| author | Stefan Giehl <stefan@matomo.org> | 2020-05-27 11:58:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 11:58:17 +0300 |
| commit | d68ca687e061357faed004d26cb77cef077b4e34 (patch) | |
| tree | db2261de1917fc8f235cd0abe6e5043f57944a4f /plugins/Contents | |
| parent | 266073ae2d1be4f95953c0c8f49ef29af75f97a3 (diff) | |
Removes director detection (#15989)
* Remove detection for director
* Drop column
* some more adjustments
* submodule updates
* updates expected test files
* updates expected UI files
* fix test
* rebuilt piwik.js
* submodule updates
* fix tests
Co-authored-by: pebosi <mail@pebosi.net>
Co-authored-by: Peter Boden <p.boden@pax.de>
Co-authored-by: sgiehl <sgiehl@users.noreply.github.com>
Diffstat (limited to 'plugins/Contents')
6 files changed, 11 insertions, 31 deletions
diff --git a/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php b/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php index 18efe75d06..28db454792 100644 --- a/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php +++ b/plugins/Contents/tests/Fixtures/TwoVisitsWithContents.php @@ -50,7 +50,7 @@ class TwoVisitsWithContents extends Fixture $this->dateTime = Date::factory($this->dateTime)->addHour(0.5); $vis2 = self::getTracker($this->idSite, $this->dateTime, $useDefault = true, $uselocal); $vis2->setIp('111.1.1.1'); - $vis2->setPlugins($flash = false, $java = false, $director = true); + $vis2->setPlugins($flash = false, $java = false); $this->trackContentImpressionsAndInteractions($vis2); } diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 6b48c4ee87..5411be7201 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -395,7 +395,7 @@ <idVisit>2</idVisit> <visitIp>111.1.1.1</visitIp> - <fingerprint>8f3c392c43450541</fingerprint> + <fingerprint>14db763aafccd039</fingerprint> <actionDetails> <row> <type>action</type> @@ -764,16 +764,12 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>cookie, director</plugins> + <plugins>cookie</plugins> <pluginsIcons> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> <pluginName>cookie</pluginName> </row> - <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> - <pluginName>director</pluginName> - </row> </pluginsIcons> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 6b48c4ee87..5411be7201 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -395,7 +395,7 @@ <idVisit>2</idVisit> <visitIp>111.1.1.1</visitIp> - <fingerprint>8f3c392c43450541</fingerprint> + <fingerprint>14db763aafccd039</fingerprint> <actionDetails> <row> <type>action</type> @@ -764,16 +764,12 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>cookie, director</plugins> + <plugins>cookie</plugins> <pluginsIcons> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> <pluginName>cookie</pluginName> </row> - <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> - <pluginName>director</pluginName> - </row> </pluginsIcons> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 6b48c4ee87..5411be7201 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -395,7 +395,7 @@ <idVisit>2</idVisit> <visitIp>111.1.1.1</visitIp> - <fingerprint>8f3c392c43450541</fingerprint> + <fingerprint>14db763aafccd039</fingerprint> <actionDetails> <row> <type>action</type> @@ -764,16 +764,12 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>cookie, director</plugins> + <plugins>cookie</plugins> <pluginsIcons> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> <pluginName>cookie</pluginName> </row> - <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> - <pluginName>director</pluginName> - </row> </pluginsIcons> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 6b48c4ee87..5411be7201 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -395,7 +395,7 @@ <idVisit>2</idVisit> <visitIp>111.1.1.1</visitIp> - <fingerprint>8f3c392c43450541</fingerprint> + <fingerprint>14db763aafccd039</fingerprint> <actionDetails> <row> <type>action</type> @@ -764,16 +764,12 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>cookie, director</plugins> + <plugins>cookie</plugins> <pluginsIcons> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> <pluginName>cookie</pluginName> </row> - <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> - <pluginName>director</pluginName> - </row> </pluginsIcons> </row> </result>
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 6b48c4ee87..5411be7201 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -395,7 +395,7 @@ <idVisit>2</idVisit> <visitIp>111.1.1.1</visitIp> - <fingerprint>8f3c392c43450541</fingerprint> + <fingerprint>14db763aafccd039</fingerprint> <actionDetails> <row> <type>action</type> @@ -764,16 +764,12 @@ <customVariables> </customVariables> <resolution>1024x768</resolution> - <plugins>cookie, director</plugins> + <plugins>cookie</plugins> <pluginsIcons> <row> <pluginIcon>plugins/Morpheus/icons/dist/plugins/cookie.png</pluginIcon> <pluginName>cookie</pluginName> </row> - <row> - <pluginIcon>plugins/Morpheus/icons/dist/plugins/director.png</pluginIcon> - <pluginName>director</pluginName> - </row> </pluginsIcons> </row> </result>
\ No newline at end of file |