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:
Diffstat (limited to 'tests/UI/specs/UIIntegration_spec.js')
-rw-r--r--tests/UI/specs/UIIntegration_spec.js21
1 files changed, 11 insertions, 10 deletions
diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js
index 4e866037ab..888391e81c 100644
--- a/tests/UI/specs/UIIntegration_spec.js
+++ b/tests/UI/specs/UIIntegration_spec.js
@@ -30,7 +30,9 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
});
beforeEach(function () {
- delete testEnvironment.configOverride;
+ if (testEnvironment.configOverride.database) {
+ delete testEnvironment.configOverride.database;
+ }
testEnvironment.testUseMockAuth = 1;
testEnvironment.save();
});
@@ -528,15 +530,14 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
// DB error message
it('should fail correctly when db information in config is incorrect', function (done) {
- testEnvironment.configOverride = {
- database: {
- host: config.phpServer.REMOTE_ADDR,
- username: 'slkdfjsdlkfj',
- password: 'slkdfjsldkfj',
- dbname: 'abcdefg',
- tables_prefix: 'gfedcba'
- }
- };
+
+ testEnvironment.overrideConfig('database', {
+ host: config.phpServer.REMOTE_ADDR,
+ username: 'slkdfjsdlkfj',
+ password: 'slkdfjsldkfj',
+ dbname: 'abcdefg',
+ tables_prefix: 'gfedcba'
+ });
testEnvironment.save();
expect.screenshot('db_connect_error').to.be.capture(function (page) {