diff options
Diffstat (limited to 'tests')
9 files changed, 26 insertions, 20 deletions
diff --git a/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php b/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php index 79fe1619cc..773482d603 100644 --- a/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php +++ b/tests/PHPUnit/Unit/DataTable/Filter/ColumnDeleteTest.php @@ -35,14 +35,14 @@ class ColumnDeleteTest extends \PHPUnit_Framework_TestCase protected function makeDataTable_withoutVisitsColumn($appendRowWithSubtable = true) { $table = new DataTable(); - $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row1', 'arrayColumn' => array('columnWithin' => 10)))); - $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row2', 'arrayColumn' => array('columnWithin' => 11)))); - $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row3', 'arrayColumn' => array('columnWithin' => 12)))); + $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row1', 'arrayColumn' => array('visits' => 0, 'columnWithin' => 10)))); + $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row2', 'arrayColumn' => array('visits' => 1, 'columnWithin' => 11)))); + $table->addRowFromArray(array(Row::COLUMNS => array('label' => 'row3', 'arrayColumn' => array('visits' => 2, 'columnWithin' => 12)))); if($appendRowWithSubtable) { $subTable = $this->makeDataTable_withoutVisitsColumn( $appendRowWithSubtable = false ); $table->addRowFromArray(array( - Row::COLUMNS => array('label' => 'row4', 'arrayColumn' => array('columnWithin' => 13)), + Row::COLUMNS => array('label' => 'row4', 'arrayColumn' => array('visits' => 3, 'columnWithin' => 13)), Row::DATATABLE_ASSOCIATED => $subTable )); } @@ -140,9 +140,9 @@ class ColumnDeleteTest extends \PHPUnit_Framework_TestCase protected function makeArray_withoutVisitsColumns() { $array = array( - array('label' => 'row1', 'arrayColumn' => array( 'columnWithin' => 10)), - array('label' => 'row2', 'arrayColumn' => array( 'columnWithin' => 11)), - array('label' => 'row3', 'arrayColumn' => array( 'columnWithin' => 12)), + array('label' => 'row1', 'arrayColumn' => array('visits' => 0, 'columnWithin' => 10)), + array('label' => 'row2', 'arrayColumn' => array('visits' => 1, 'columnWithin' => 11)), + array('label' => 'row3', 'arrayColumn' => array('visits' => 2, 'columnWithin' => 12)), ); return $array; } diff --git a/tests/UI/expected-screenshots/Overlay_page_new_links.png b/tests/UI/expected-screenshots/Overlay_page_new_links.png index 3cd92a27b2..40c45e79c9 100644 --- a/tests/UI/expected-screenshots/Overlay_page_new_links.png +++ b/tests/UI/expected-screenshots/Overlay_page_new_links.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1817a1d595d787ae8502be18eb99e1cdf85c5b2ed95eb4eeaf2b3b9446c5019 -size 95316 +oid sha256:37d5585ce3c48cb49c152a1f7b67dff826e5bad59ce2b0c07298672c99d95b70 +size 105869 diff --git a/tests/UI/expected-screenshots/PivotByDimension_pivoted.png b/tests/UI/expected-screenshots/PivotByDimension_pivoted.png index ff1a1d1ede..17936d22f6 100644 --- a/tests/UI/expected-screenshots/PivotByDimension_pivoted.png +++ b/tests/UI/expected-screenshots/PivotByDimension_pivoted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:27b0bb8135ee54541672b136ed534f979f458cb1aa4191a69d4f2d2ae2fc6313 -size 69880 +oid sha256:2a937ec46b86cdd76237fb16c4b77da09ccac5016527ae5dc3e2b59a5da66d68 +size 63446 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png index f0d8e62af8..f21577214b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_fatal_error_safemode.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5eaade9619d4cbad93e0731456fdcbb46b3d3c17494d1bfc718b7e8e2ce36256 -size 193496 +oid sha256:bbf49718ef99a89e8fce923f0fba79ccb28bca3505c852b2a6f5c12da7504489 +size 193525 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png b/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png index 663f19a7ba..5cf89d52cf 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_feedback_form.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:345a5f372e41dbb87adba671565624fcfc9efdbff12d4730a1d25ae870af5dab -size 172545 +oid sha256:aa6a3ce329948c714a4491c2ffa497ae40884beba4ae2f2254caf796c32f1aab +size 173927 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png index 8090ecf532..ff42467040 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec9c25bddfe98899302a3a90731486c95473e23314df1ba8aa15502dd6077b77 -size 103297 +oid sha256:eb3ef27a3e3ae39417687002c9af7600824c75fdd51be475f6716319d03860fe +size 113419 diff --git a/tests/UI/specs/Overlay_spec.js b/tests/UI/specs/Overlay_spec.js index a0a7eb38dc..53888b14ac 100644 --- a/tests/UI/specs/Overlay_spec.js +++ b/tests/UI/specs/Overlay_spec.js @@ -69,7 +69,7 @@ describe("Overlay", function () { }); it("should show stats for new links when dropdown opened", function (done) { - expect.screenshot("page_new_links").to.be.similar(0.002).to.be.capture(function (page) { + expect.screenshot("page_new_links").to.be.capture(function (page) { var pos = page.webpage.evaluate(function () { var iframe = $('iframe'), innerOffset = $('.dropdown-toggle', iframe.contents()).offset(); diff --git a/tests/UI/specs/PivotByDimension_spec.js b/tests/UI/specs/PivotByDimension_spec.js index cfe367438b..44f6fb0c74 100644 --- a/tests/UI/specs/PivotByDimension_spec.js +++ b/tests/UI/specs/PivotByDimension_spec.js @@ -25,8 +25,10 @@ describe("PivotByDimension", function () { page.load(eventsUrl); page.click('.dimension:contains(Event Names)'); showDataTableFooter(page); - page.click('.dropdownConfigureIcon'); - page.click('.dataTablePivotBySubtable'); + page.evaluate(function(){ + $('.dropdownConfigureIcon').click(); + $('.dataTablePivotBySubtable').click(); + }, 2000); page.mouseMove({x: -15, y: -15}); // make sure nothing is highlighted }, done); }); diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js index b3e51288af..2519d08f3c 100644 --- a/tests/UI/specs/UIIntegration_spec.js +++ b/tests/UI/specs/UIIntegration_spec.js @@ -150,6 +150,10 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? page.load("?" + urlBase + "#?" + idSite2Params + "&category=General_Visitors&subcategory=UserCountryMap_RealTimeMap" + "&showDateTime=0&realtimeWindow=last2&changeVisitAlpha=0&enableAnimation=0&doNotRefreshVisits=1" + "&removeOldVisits=0"); + page.mouseMove('circle'); + page.evaluate(function(){ + $('.ui-tooltip:visible .rel-time').data('actiontime', Math.floor(new Date((new Date()).getTime()-(4*3600*24000))/1000)); + }); }, done); }); |
