From bdd2df4586becfa98f7d7cc576fe2af11c835b65 Mon Sep 17 00:00:00 2001 From: mattab <matthieu.aubry@gmail.com> Date: Sat, 15 Mar 2014 12:51:44 +1300 Subject: [PATCH] Moving back &_viewts affects the VisitFrequency, VisitorInterest reports and <daysSinceLastVisit> all work as expected. --- ...ImportLogs__Live.getLastVisitsDetails_range.xml | 6 +++--- .../test_ImportLogs__VisitFrequency.get_range.xml | 14 +++++++------- ...rest.getNumberOfVisitsByDaysSinceLast_range.xml | 4 ++-- tests/resources/access-logs/fake_logs_replay.log | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 57a513a2da..4fe6fed70c 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -359,8 +359,8 @@ <idVisit>37</idVisit> <visitIp>50.244.17.130</visitIp> - <visitorType>new</visitorType> - <visitorTypeIcon /> + <visitorType>returning</visitorType> + <visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon> <visitConverted>1</visitConverted> <visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon> <visitEcommerceStatus>none</visitEcommerceStatus> @@ -419,7 +419,7 @@ <visitDuration>34</visitDuration> <visitDurationPretty>34s</visitDurationPretty> <visitCount>1</visitCount> - <daysSinceLastVisit>0</daysSinceLastVisit> + <daysSinceLastVisit>6</daysSinceLastVisit> <daysSinceFirstVisit>17</daysSinceFirstVisit> <daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder> <continent>North America</continent> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_range.xml index 2609819757..f301254690 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_range.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitFrequency.get_range.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <nb_visits_returning>9</nb_visits_returning> - <nb_actions_returning>10</nb_actions_returning> - <nb_visits_converted_returning>8</nb_visits_converted_returning> + <nb_visits_returning>10</nb_visits_returning> + <nb_actions_returning>12</nb_actions_returning> + <nb_visits_converted_returning>9</nb_visits_converted_returning> <bounce_count_returning>8</bounce_count_returning> - <sum_visit_length_returning>81</sum_visit_length_returning> + <sum_visit_length_returning>115</sum_visit_length_returning> <max_actions_returning>2</max_actions_returning> - <bounce_rate_returning>89%</bounce_rate_returning> - <nb_actions_per_visit_returning>1.1</nb_actions_per_visit_returning> - <avg_time_on_site_returning>9</avg_time_on_site_returning> + <bounce_rate_returning>80%</bounce_rate_returning> + <nb_actions_per_visit_returning>1.2</nb_actions_per_visit_returning> + <avg_time_on_site_returning>12</avg_time_on_site_returning> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml index f9b2922eed..c7ed81d100 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitorInterest.getNumberOfVisitsByDaysSinceLast_range.xml @@ -2,7 +2,7 @@ <result> <row> <label>New visits</label> - <nb_visits>31</nb_visits> + <nb_visits>30</nb_visits> </row> <row> <label>0 days</label> @@ -30,7 +30,7 @@ </row> <row> <label>6 days</label> - <nb_visits>0</nb_visits> + <nb_visits>1</nb_visits> </row> <row> <label>7 days</label> diff --git a/tests/resources/access-logs/fake_logs_replay.log b/tests/resources/access-logs/fake_logs_replay.log index 7ee2ae3ba5..2ee6b1102c 100644 --- a/tests/resources/access-logs/fake_logs_replay.log +++ b/tests/resources/access-logs/fake_logs_replay.log @@ -19,7 +19,7 @@ 219.101.46.222 - - [13/Mar/2014:01:33:50 +0100] "GET /piwik.php?action_name=Log%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=263291&h=9&m=33&s=50&url=https%3A%2F%2Fpiwik.org%2Flog-analytics%2F&urlref=https%3A%2F%2Fwww.google.co.jp%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D2%26ved%3D0CDAQFjAB%26url%3Dhttps%253A%252F%252Fpiwik.org%252Flog-analytics%252F%26ei%3DrogdU5OuK43pkgXZmYGICA%26usg%3DAFQjCNH4nR8bKYaliCj2egiJ0H_CX4sFJg%26bvm%3Dbv.62578216%2Cd.dGI&_id=15164ceeb5ddb76f&_idts=1394444478&_idvc=4&_idn=0&_refts=1394670831&_viewts=1394584228&_ref=https%3A%2F%2Fwww.google.co.jp%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D2%26ved%3D0CDAQFjAB%26url%3Dhttps%253A%252F%252Fpiwik.org%252Flog-analytics%252F%26ei%3DrogdU5OuK43pkgXZmYGICA%26usg%3DAFQjCNH4nR8bKYaliCj2egiJ0H_CX4sFJg%26bvm%3Dbv.62578216%2Cd.dGI&pdf=1&qt=1&realp=0&wma=0&dir=0&fla=0&java=1&gears=0&ag=0&cookie=1&res=2560x1440&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D HTTP/1.1" 200 43 "https://piwik.org/log-analytics/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.74.9 (KHTML, like Gecko) Version/7.0.2 Safari/537.74.9" 108.211.181.12 - - [13/Mar/2014:01:33:55 +0100] "GET /piwik.php?action_name=Integrate%20Piwik%20into%20your%20Rails%20Application%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=006719&h=17&m=33&s=58&url=http%3A%2F%2Fpiwik.org%2Fblog%2F2012%2F10%2Fintegrate-piwik-into-your-rails-application%2F&urlref=https%3A%2F%2Fwww.google.com%2F&_id=3d9cad3fc284c272&_idts=1394670839&_idvc=1&_idn=1&_refts=1394670839&_viewts=1394670839&_ref=https%3A%2F%2Fwww.google.com%2F&pdf=1&qt=1&realp=0&wma=1&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1360x768&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=391 HTTP/1.1" 200 43 "http://piwik.org/blog/2012/10/integrate-piwik-into-your-rails-application/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.149 Safari/537.36" #piwisk -50.244.17.130 - - [13/Mar/2014:01:33:59 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=658858&h=19&m=34&s=1&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fwww.google.com%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCcQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3D8vwgU8TYDZTI2wWTi4CQCA%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.b2I&_id=90d89274a8c26d90&_idts=1393170841&_idvc=1&_idvc=1&_idn=0&_refts=1394670841&_viewts=1394670841&_ref=http%3A%2F%2Fwww.google.com%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCcQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3D8vwgU8TYDZTI2wWTi4CQCA%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.b2I&pdf=1&qt=1&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=2880x1800&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.74.9 (KHTML, like Gecko) Version/7.0.2 Safari/537.74.9" +50.244.17.130 - - [13/Mar/2014:01:33:59 +0100] "GET /piwik.php?action_name=Liberate%20Web%20Analytics%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=658858&h=19&m=34&s=1&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fwww.google.com%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCcQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3D8vwgU8TYDZTI2wWTi4CQCA%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.b2I&_id=90d89274a8c26d90&_idts=1393170841&_idvc=1&_idn=0&_refts=1394670841&_viewts=1394170841&_ref=http%3A%2F%2Fwww.google.com%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCcQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3D8vwgU8TYDZTI2wWTi4CQCA%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.b2I&pdf=1&qt=1&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=2880x1800&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.74.9 (KHTML, like Gecko) Version/7.0.2 Safari/537.74.9" #this visitor visited the website yesterday 84.194.72.21 - - [13/Mar/2014:01:34:21 +0100] "GET /piwik.php?link=http%3A%2F%2Fdemo.piwik.org%2F&idsite=1&rec=1&forceLargeWindowLookBackForVisitor=1&r=578077&h=1&m=34&s=24&url=http%3A%2F%2Fpiwik.org%2F&urlref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&_id=e01d58157d66e023&_idts=1394670858&_idvc=1&_idn=0&_refts=1394670858&_viewts=1394670858&_ref=http%3A%2F%2Fmusicforeveryoneradio.be%3A2222%2FCMD_PLUGINS%2Finstallatron%2Findex.raw&pdf=1&qt=0&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=1&cookie=1&res=1920x1080&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D>_ms=58 HTTP/1.1" 200 43 "http://piwik.org/" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.146 Safari/537.36" 50.244.17.130 - - [13/Mar/2014:01:34:31 +0100] "GET /piwik.php?action_name=What%20is%20Piwik%3F%20-%20Analytics%20-%20Piwik&idsite=1&rec=1&r=388822&h=19&m=34&s=33&url=http%3A%2F%2Fpiwik.org%2Fwhat-is-piwisk%2F&urlref=http%3A%2F%2Fpiwik.org%2F&_id=90d89274a8c26d90&_idts=1394170841&_idvc=1&_idn=0&_refts=1394670841&_viewts=1394670841&_ref=http%3A%2F%2Fwww.google.com%2Furl%3Fsa%3Dt%26rct%3Dj%26q%3D%26esrc%3Ds%26source%3Dweb%26cd%3D1%26ved%3D0CCcQFjAA%26url%3Dhttp%253A%252F%252Fpiwik.org%252F%26ei%3D8vwgU8TYDZTI2wWTi4CQCA%26usg%3DAFQjCNF_MGJRqKPvaKuUokHtZ3VvNG9ALw%26bvm%3Dbv.62922401%2Cd.b2I&pdf=1&qt=1&realp=0&wma=0&dir=0&fla=1&java=1&gears=0&ag=0&cookie=1&res=2880x1800&_cvar=%7B%221%22%3A%5B%22Domain%20landed%22%2C%22piwik.org%22%5D%7D HTTP/1.1" 200 43 "http://piwik.org/what-is-piwik/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.74.9 (KHTML, like Gecko) Version/7.0.2 Safari/537.74.9" -- GitLab