From 7bd37a1ecc7bb93eaabed8a2bd615af94e042a8c Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Sun, 18 Sep 2016 16:39:05 +0200
Subject: [PATCH] fixes tests
---
composer.lock | 10 +++++-----
.../{www.kvasir.no.png => kvasir.no.png} | Bin
.../images/searchEngines/www.118700.se.png | Bin 0 -> 392 bytes
.../searchEngines/www.allaverksamheter.se.png | Bin 0 -> 468 bytes
.../images/searchEngines/www.isodelen.se.png | Bin 0 -> 421 bytes
.../images/searchEngines/www.riksdelen.se.png | Bin 0 -> 229 bytes
...GetReportMetadata__API.getSegmentsMetadata.xml | 2 +-
...extractSearchEngineInformationFromUrlTests.yml | 2 +-
8 files changed, 7 insertions(+), 7 deletions(-)
rename plugins/Referrers/images/searchEngines/{www.kvasir.no.png => kvasir.no.png} (100%)
create mode 100644 plugins/Referrers/images/searchEngines/www.118700.se.png
create mode 100644 plugins/Referrers/images/searchEngines/www.allaverksamheter.se.png
create mode 100644 plugins/Referrers/images/searchEngines/www.isodelen.se.png
create mode 100644 plugins/Referrers/images/searchEngines/www.riksdelen.se.png
diff --git a/composer.lock b/composer.lock
index 1dcabb1a79..6025211961 100644
--- a/composer.lock
+++ b/composer.lock
@@ -885,16 +885,16 @@
},
{
"name": "piwik/searchengine-and-social-list",
- "version": "1.3.2",
+ "version": "1.3.3",
"source": {
"type": "git",
"url": "https://github.com/piwik/searchengine-and-social-list.git",
- "reference": "e987612793b64b96e32144a2ef8420749ef4e421"
+ "reference": "07046e6c6472f3cf7751f45f7b1f1657dcf920e7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/piwik/searchengine-and-social-list/zipball/e987612793b64b96e32144a2ef8420749ef4e421",
- "reference": "e987612793b64b96e32144a2ef8420749ef4e421",
+ "url": "https://api.github.com/repos/piwik/searchengine-and-social-list/zipball/07046e6c6472f3cf7751f45f7b1f1657dcf920e7",
+ "reference": "07046e6c6472f3cf7751f45f7b1f1657dcf920e7",
"shasum": ""
},
"type": "library",
@@ -903,7 +903,7 @@
"Public Domain"
],
"description": "Search engine and social network definitions used by Piwik",
- "time": "2016-09-18 13:48:45"
+ "time": "2016-09-18 14:28:00"
},
{
"name": "psr/log",
diff --git a/plugins/Referrers/images/searchEngines/www.kvasir.no.png b/plugins/Referrers/images/searchEngines/kvasir.no.png
similarity index 100%
rename from plugins/Referrers/images/searchEngines/www.kvasir.no.png
rename to plugins/Referrers/images/searchEngines/kvasir.no.png
diff --git a/plugins/Referrers/images/searchEngines/www.118700.se.png b/plugins/Referrers/images/searchEngines/www.118700.se.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ee93f8d9ecb32b3ee4de47ce9125da672408e83
GIT binary patch
literal 392
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sDEfH31!Z9ZwB23b!R#}Etuxsz?Vm>hXp#rJfIZ~Q3qNOj9+
z2C;b#IXP=t58gX;%8lE4W3aZPOT?d>vVWQMSyo?VKd3T!kLSI<$X^NN7R#eHPrtTX
zd10bWe5BuwJD)=G`E}a2{+b*zO*8f9--joUrsW^K{PbEeQ~HtRpRd+>^ft^^cGM9{
z@>wh#@vPZ{Aw=bc(6ZNj>Cf!rT}zpK9gKfJHm*%&k}_<lnDdiM%dPU*A_wJSwv4<I
zH?h~NEg2hoG+i{9Ii!ngg045HNw)eN&^;x{To%SBpCV-{rSkFO181S)8J!**k2o^F
z^<?zz>0B?f-(g=p>)it`T4Gv)9+4gYlpYjrVEQqW!O&v?dw`*#80VudKL??YE%`^k
jUcV}Q%%Xl@*B3VTBAI-PtTY>7=rMS@`njxgN@xNAyTp>B
literal 0
HcmV?d00001
diff --git a/plugins/Referrers/images/searchEngines/www.allaverksamheter.se.png b/plugins/Referrers/images/searchEngines/www.allaverksamheter.se.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba8931859f75e4ab97ba3f59b6ba9a49186eea9d
GIT binary patch
literal 468
zcmV;_0W1EAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0clA@K~y+T-I2>n
z0#Ovk{hww=je!DtXr#UCA86Cx&?0EpqBapd2znWs&#Zhx&>{+2WQ#y+5lEKR%nhs*
zO`Z9=b0-aJSF8Hq+njsP?;O5kz%TXR0E$wBT6z8EuTrbUhMNHX`Eeu{1jruhKr7@>
z2jtyOlyk?ZzGRU<nV_|Hkgx+JK7>Mg{S#2ko#9}{1mBcdZ{F_)iS|+V<341=^%{={
z7YEtf!k{G5OIJ}o0BQ|V$d2?1kLa`smre`&K;pw7i4l<408*<WG8;S|-4x;zQOd+v
zD+3g-+>ks*+--5VSQc<JC+gF+=ENuk3?dh_;(SrS%_awlLX^^z4$y)i5eMWQ3#4rU
zStrMG$auTh`r35%PV-1Enb`m-KE|3g8S<x-ED$-|13B16Av|sac08wCkoT<AHa$$g
zNZ~vVXN@S(yy{{bG+Zg@XQP>DQfqIGTHV!h^I4nD_!Iqk0Pqe}5TrlTURdz}0000<
KMNUMnLSTZVNyDB1
literal 0
HcmV?d00001
diff --git a/plugins/Referrers/images/searchEngines/www.isodelen.se.png b/plugins/Referrers/images/searchEngines/www.isodelen.se.png
new file mode 100644
index 0000000000000000000000000000000000000000..e24529ad91ae3e8df948e4a85abfd6108aead02c
GIT binary patch
literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf0Xj)UK~y+Tjgz}h
zLO~FQx5LU?$4h9Vi6+>|Q_!kWd=535$V2EW7!#0=5V0^)sR_Xb6Wdc`F`jR9mN|=v
zll<A)otb~<vKu6k@#k3D4=p)7*^|xMx@^?e<S5tMy_VWiDG=QCno{0fk)=vWmUk9(
zHLx#NSJlT$B)Ggfk3qU_mt=A48|a=4UlS#OH3t4Ty$qfu%Q8jxu~Q_^SIZ<&7peJR
zF!~s&1JZwenzB<Wv4Q4zgJBkdC!*PbZl?zD8$n9KbOK{agF#A=+KC}HFl&Ek`d>XT
zo!CGc9C!!tpAwGG4kk_X1nBch0NO+yV?GkQ!7z`2(d!s-@DB-~-}k%n_C8eHc5dRi
zfy|NklpEI<k-!sq-S$&Y*~EV)A7BKeZ8w_~2oUPB@64P*{d9lEcNX~qSQ=t8{BXKE
P00000NkvXXu0mjf^x3Z2
literal 0
HcmV?d00001
diff --git a/plugins/Referrers/images/searchEngines/www.riksdelen.se.png b/plugins/Referrers/images/searchEngines/www.riksdelen.se.png
new file mode 100644
index 0000000000000000000000000000000000000000..c41de9e417fba22ea816e196ae6471dca7169df7
GIT binary patch
literal 229
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sDEfH31!Z9ZwBV3ntfV~B-+@(+HNvPRASTi-Z)98$1VIFRsi
zc0(wmp~RBujI&uZCGr?F8#I_Fi2Bak&ZNb~n18Rf;j~~XgI(n>iGoLOQdelOSg<WW
z_|${%$evqyJJR;BDQIiu&SMa5ZIJ!lfADFWhr*-D?a~f<%WRAr=Q!7u{rfM^;Pa{7
VU~AeB5uhs=JYD@<);T3K0RToLN=pC$
literal 0
HcmV?d00001
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
index aaae0ff362..4e256b9e19 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
@@ -142,7 +142,7 @@
<category>Visit</category>
<name>Device brand</name>
<segment>deviceBrand</segment>
- <acceptedValues>3Q, Acer, Ainol, Airness, Alcatel, Allview, Altech UEC, Arnova, Amazon, Amoi, Apple, Archos, ARRIS, Airties, Asus, Avvio, Audiovox, Axxion, BBK, Becker, Bird, Beetel, Bmobile, Barnes & Noble, BangOlufsen, BenQ, BenQ-Siemens, Blu, Boway, bq, Brondi, Bush, CUBOT, Carrefour, Captiva, Casio, Cat, Celkon, ConCorde, Changhong, Cherry Mobile, Cricket, Crosscall, Compal, CnM, Crius Mea, CreNova, Capitel, Compaq, Coolpad, Cowon, Cube, Coby Kyros, Danew, Datang, Denver, Desay, Dbtel, DoCoMo, Dicam, Dell, DNS, DMM, Doogee, Doov, Dopod, Dune HD, E-Boda, EBEST, Ericsson, ECS, Ezio, Elephone, Easypix, Energy Sistem, Ericy, Eton, eTouch, Evertek, Explay, Ezze, Fairphone, Fly, Foxconn, Fujitsu, Garmin-Asus, Gateway, Gemini, Gionee, Gigabyte, Gigaset, GOCLEVER, Goly, Google, Gradiente, Grundig, Haier, Hasee, Hisense, Hi-Level, Hosin, HP, HTC, Huawei, Humax, Hyrican, Hyundai, Ikea, iBall, i-Joy, iBerry, iKoMo, i-mate, iOcean, iNew, Infinix, Innostream, Inkti, Intex, i-mobile, INQ, Intek, Inverto, iTel, Jiayu, Jolla, Karbonn, KDDI, Kingsun, Konka, Komu, Koobee, K-Touch, KT-Tech, KOPO, Koridy, Kumai, Kyocera, Kazam, Lava, Lanix, LCT, Lenovo, Lenco, Le Pan, LG, Lingwin, Loewe, Logicom, Lexibook, Majestic, Manta Multimedia, Mobistel, Mecer, Medion, MEEG, Meizu, Metz, MEU, MicroMax, Mediacom, MediaTek, Mio, Mpman, Mofut, Motorola, Microsoft, MSI, Memup, Mitsubishi, MLLED, M.T.T., MyPhone, NEC, Netgear, NGM, Nintendo, Noain, Nokia, Nomi, Nikon, Newgen, Nexian, NextBook, Onda, OnePlus, OPPO, Orange, O2, Ouki, OUYA, Opsson, Panasonic, PEAQ, Philips, Pioneer, Polaroid, Palm, phoneOne, Pantech, Ployer, Point of View, PolyPad, Pomp, Positivo, Prestigio, ProScan, PULID, Qilive, Qtek, QMobile, Quechua, Overmax, Oysters, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Roku, Rover, Samsung, Sega, Sony Ericsson, Sencor, Softbank, SFR, Sagem, Sharp, Siemens, Sendo, Skyworth, Smartfren, Sony, Spice, SuperSonic, Selevision, Sanyo, Symphony, Smart, Star, Storex, Stonex, SunVan, Sumvision, Tesla, TCL, Telit, ThL, TiPhone, Tecno Mobile, Tesco, TIANYU, Telefunken, Telenor, T-Mobile, Thomson, Tolino, Toplux, Toshiba, TechnoTrend, Trevi, Tunisie Telecom, Turbo-X, TVC, TechniSat, teXet, Unowhy, Uniscope, UTStarcom, Vastking, Videocon, Vertu, Vitelcom, VK Mobile, ViewSonic, Vestel, Vivo, Voto, Voxtel, Vodafone, Vizio, Videoweb, Walton, WellcoM, Wexler, Wiko, Wolder, Wonu, Woxter, Xiaomi, Xolo, Yarvik, Yuandao, Yusun, Ytone, Zeemi, Zonda, Zopo, ZTE, Web TV, Unknown</acceptedValues>
+ <acceptedValues>3Q, Acer, Ainol, Airness, Alcatel, Allview, Altech UEC, Arnova, Amazon, Amoi, Apple, Archos, ARRIS, Airties, Asus, Avvio, Audiovox, Axxion, BBK, Becker, Bird, Beetel, Bmobile, Barnes & Noble, BangOlufsen, BenQ, BenQ-Siemens, Blu, Boway, bq, Brondi, Bush, CUBOT, Carrefour, Captiva, Casio, Cat, Celkon, ConCorde, Changhong, Cherry Mobile, Cricket, Crosscall, Compal, CnM, Crius Mea, CreNova, Capitel, Compaq, Coolpad, Cowon, Cube, Coby Kyros, Danew, Datang, Denver, Desay, Dbtel, DoCoMo, Dicam, Dell, DNS, DMM, Doogee, Doov, Dopod, Dune HD, E-Boda, EBEST, Ericsson, ECS, Ezio, Elephone, Easypix, Energy Sistem, Ericy, Eton, eTouch, Evertek, Explay, Ezze, Fairphone, Fly, Foxconn, Fujitsu, Garmin-Asus, Gateway, Gemini, Gionee, Gigabyte, Gigaset, GOCLEVER, Goly, Google, Gradiente, Grundig, Haier, Hasee, Hisense, Hi-Level, Hosin, HP, HTC, Huawei, Humax, Hyrican, Hyundai, Ikea, iBall, i-Joy, iBerry, iKoMo, i-mate, iOcean, iNew, Infinix, Innostream, Inkti, Intex, i-mobile, INQ, Intek, Inverto, iTel, Jiayu, Jolla, Karbonn, KDDI, Kiano, Kingsun, Konka, Komu, Koobee, K-Touch, KT-Tech, KOPO, Koridy, Kumai, Kyocera, Kazam, Lava, Lanix, LCT, Lenovo, Lenco, Le Pan, LG, Lingwin, Loewe, Logicom, Lexibook, Majestic, Manta Multimedia, Mobistel, Mecer, Medion, MEEG, Meizu, Metz, MEU, MicroMax, Mediacom, MediaTek, Mio, Mpman, Mofut, Motorola, Microsoft, MSI, Memup, Mitsubishi, MLLED, M.T.T., MyPhone, NEC, Netgear, NGM, Nintendo, Noain, Nokia, Nomi, Nikon, Newgen, Nexian, NextBook, Onda, OnePlus, OPPO, Orange, O2, Ouki, OUYA, Opsson, Panasonic, PEAQ, Philips, Pioneer, Polaroid, Palm, phoneOne, Pantech, Ployer, Point of View, PolyPad, Pomp, Positivo, Prestigio, ProScan, PULID, Qilive, Qtek, QMobile, Quechua, Overmax, Oysters, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Roku, Rover, Samsung, Sega, Sony Ericsson, Sencor, Softbank, SFR, Sagem, Sharp, Siemens, Sendo, Skyworth, Smartfren, Sony, Spice, SuperSonic, Selevision, Sanyo, Symphony, Smart, Star, Storex, Stonex, SunVan, Sumvision, Tesla, TCL, Telit, ThL, TiPhone, Tecno Mobile, Tesco, TIANYU, Telefunken, Telenor, T-Mobile, Thomson, Tolino, Toplux, Toshiba, TechnoTrend, Trevi, Tunisie Telecom, Turbo-X, TVC, TechniSat, teXet, Unowhy, Uniscope, UTStarcom, Vastking, Videocon, Vertu, Vitelcom, VK Mobile, ViewSonic, Vestel, Vivo, Voto, Voxtel, Vodafone, Vizio, Videoweb, Walton, WellcoM, Wexler, Wiko, Wolder, Wonu, Woxter, Xiaomi, Xolo, Yarvik, Yuandao, Yusun, Ytone, Zeemi, Zonda, Zopo, ZTE, Web TV, Unknown</acceptedValues>
</row>
<row>
<type>dimension</type>
diff --git a/tests/resources/extractSearchEngineInformationFromUrlTests.yml b/tests/resources/extractSearchEngineInformationFromUrlTests.yml
index c300e768bc..879ba91707 100644
--- a/tests/resources/extractSearchEngineInformationFromUrlTests.yml
+++ b/tests/resources/extractSearchEngineInformationFromUrlTests.yml
@@ -465,7 +465,7 @@
keywords: false
- url: 'https://ixquick.com/do/asearch'
- engine: 'Ixquick'
+ engine: 'IxQuick'
keywords: false
# DuckDuckGo never provides a keyword
--
GitLab