Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@piwik.org>2017-12-04 20:34:24 +0300
committerGitHub <noreply@github.com>2017-12-04 20:34:24 +0300
commitdff7d2fed1f2baa5ec9106d00e37e14deeba1926 (patch)
treed878f8a02b7124313fd96b49ad6c52c2ba1a8b41
parentc2894cff0d6b30e2786db0633628e3702127068f (diff)
Moved UI tests from core to custom alerts plugin (#12330)
* Moved UI tests from core to custom alerts plugin * submodule update
m---------plugins/CustomAlerts0
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list.png3
-rw-r--r--tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list_triggered.png3
-rw-r--r--tests/UI/specs/UIIntegration_spec.js13
4 files changed, 0 insertions, 19 deletions
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
-Subproject d39b0f0a78b7a969967c88662d42b56cd0230ce
+Subproject 74d010bc51fe941bed0ae80e84b01ee106725a3
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list.png b/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list.png
deleted file mode 100644
index 28219108cc..0000000000
--- a/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e29ec3c9c697deb1244e790c0e749e9e936aa2833323dee2fed5c2adef3d9a9a
-size 23286
diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list_triggered.png b/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list_triggered.png
deleted file mode 100644
index d3d2a9618e..0000000000
--- a/tests/UI/expected-screenshots/UIIntegrationTest_customalerts_list_triggered.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a7be9db9925d1861ada3dd2fa7cb53820cdb16751f6eb7fd85e3244a830fd04b
-size 19218
diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js
index aff7121a34..6812cd9e96 100644
--- a/tests/UI/specs/UIIntegration_spec.js
+++ b/tests/UI/specs/UIIntegration_spec.js
@@ -622,19 +622,6 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
}, done);
});
- // CustomAlerts plugin TODO: move to CustomAlerts plugin
- it('should load the custom alerts list correctly', function (done) {
- expect.screenshot('customalerts_list').to.be.captureSelector('.pageWrap', function (page) {
- page.load("?" + generalParams + "&module=CustomAlerts&action=index&idSite=1&period=day&date=yesterday&tests_hide_piwik_version=1");
- }, done);
- });
-
- it('should load the triggered custom alerts list correctly', function (done) {
- expect.screenshot('customalerts_list_triggered').to.be.captureSelector('.pageWrap', function (page) {
- page.load("?" + generalParams + "&module=CustomAlerts&action=historyTriggeredAlerts&idSite=1&period=day&date=yesterday&tests_hide_piwik_version=1");
- }, done);
- });
-
// top bar pages
it('should load the widgets listing page correctly', function (done) {
expect.screenshot('widgets_listing').to.be.captureSelector('.pageWrap', function (page) {