diff options
| author | mattab <matthieu.aubry@gmail.com> | 2016-10-07 11:54:59 +0300 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2016-10-07 11:54:59 +0300 |
| commit | 7435eea9480cd61b2c4833fad45931449c54d4f0 (patch) | |
| tree | 567cb8b67eab5c6c8bcdd12f735e42c100beb7d6 | |
| parent | 253d3df3fae68292109c68c39b4d2448005a6c92 (diff) | |
| parent | 9243b9a7b6fae8237596f76cda1fe8b6816463af (diff) | |
Merge remote-tracking branch 'origin/3.x-dev' into mattab-patch-1
Conflicts:
tests/UI/specs/UIIntegration_spec.js
| -rw-r--r-- | tests/UI/specs/UIIntegration_spec.js | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js index 71c65630cf..741f89037d 100644 --- a/tests/UI/specs/UIIntegration_spec.js +++ b/tests/UI/specs/UIIntegration_spec.js @@ -373,8 +373,6 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? }); it('should load the widgetized all websites dashboard correctly', function (done) { - this.retries(3); - expect.screenshot('widgetize_allwebsites').to.be.capture(function (page) { page.load("?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=MultiSites&actionToWidgetize=standalone"); }, done); |