diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2018-08-11 10:17:20 +0300 |
|---|---|---|
| committer | Matthieu Aubry <mattab@users.noreply.github.com> | 2018-08-11 10:17:20 +0300 |
| commit | 78426614c226c50ba3ab9afc37aa2821500fa6d5 (patch) | |
| tree | af0d74401e3425aea4e31ca3a61eb577ced4f52e /plugins/MultiSites | |
| parent | 30ae2ddbd43e46c773a01467e9a7f6da95a02fb9 (diff) | |
In piwik.updatePeriodParamsFromUrl() get period/date values from hash or URL. (#13268)
* In piwik.updatePeriodParamsFromUrl() get period/date values from hash or URL.
* Remove date parameter from defaults in ajaxHelper, already handled properly below.
* Remove .only
* fixing tests & add new test for MultiSites
* correct screenshot
* upload screenshot + remove rejected change
* Remove port in Url::isLocalHost().
Diffstat (limited to 'plugins/MultiSites')
| -rw-r--r-- | plugins/MultiSites/tests/UI/MultiSites_spec.js | 10 | ||||
| -rw-r--r-- | plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png | 3 |
2 files changed, 13 insertions, 0 deletions
diff --git a/plugins/MultiSites/tests/UI/MultiSites_spec.js b/plugins/MultiSites/tests/UI/MultiSites_spec.js index 832955e70a..e73ac3cad3 100644 --- a/plugins/MultiSites/tests/UI/MultiSites_spec.js +++ b/plugins/MultiSites/tests/UI/MultiSites_spec.js @@ -11,6 +11,7 @@ describe("MultiSitesTest", function () { this.timeout(0); var generalParams = 'idSite=1&period=year&date=2012-08-09'; + var rangeParams = 'idSite=1&period=range&date=2012-08-05,2012-08-15'; var selector = '#multisites,.expandDataTableFooterDrawer'; var createdSiteId = null; @@ -69,4 +70,13 @@ describe("MultiSitesTest", function () { }, done); }); + it('should load the all websites dashboard correctly when period is range', function (done) { + this.retries(3); + + expect.screenshot('all_websites_range').to.be.captureSelector(selector, function (page) { + page.load("?" + rangeParams + "&module=MultiSites&action=index"); + page.wait(3000); + }, done); + }); + }); diff --git a/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png new file mode 100644 index 0000000000..ea2b55930b --- /dev/null +++ b/plugins/MultiSites/tests/UI/expected-screenshots/MultiSitesTest_all_websites_range.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c36b8421ccb17493ee3563008864f91ec6a36ef1ce22d3e07b892957c367c249 +size 63159 |
