diff options
| -rw-r--r-- | plugins/TestRunner/Commands/TestsSetupFixture.php | 6 | ||||
| -rw-r--r-- | tests/README.md | 6 | ||||
| m--------- | tests/UI/expected-ui-screenshots | 0 | ||||
| -rw-r--r-- | tests/resources/OmniFixture-dump.sql.gz | bin | 656155 -> 672041 bytes | |||
| -rw-r--r-- | tests/resources/access-logs/fake_logs_custom.log | 6 |
5 files changed, 10 insertions, 8 deletions
diff --git a/plugins/TestRunner/Commands/TestsSetupFixture.php b/plugins/TestRunner/Commands/TestsSetupFixture.php index 56f4e5632f..f659eae71f 100644 --- a/plugins/TestRunner/Commands/TestsSetupFixture.php +++ b/plugins/TestRunner/Commands/TestsSetupFixture.php @@ -93,6 +93,9 @@ class TestsSetupFixture extends ConsoleCommand $_SERVER = json_decode($serverGlobal, true); } + if(Config::getInstance()->database_tests['tables_prefix'] !== '') { + throw new \Exception("To generate OmniFixture for the UI tests, you must set an empty tables_prefix in [database_tests]"); + } $this->requireFixtureFiles($input); $this->setIncludePathAsInTestBootstrap(); @@ -176,7 +179,8 @@ class TestsSetupFixture extends ConsoleCommand 'dbname' => $fixture->getDbName(), 'host' => $input->getOption('db-host'), 'username' => $input->getOption('db-user'), - 'password' => $input->getOption('db-pass') + 'password' => $input->getOption('db-pass'), + 'tables_prefix' => '', ); foreach ($optionsToOverride as $configOption => $value) { if ($value) { diff --git a/tests/README.md b/tests/README.md index a0cad6b098..8849370096 100644 --- a/tests/README.md +++ b/tests/README.md @@ -125,12 +125,10 @@ We also have an OmniFixture that includes all other Fixtures. OmniFixture is use #### Keep OmniFixture up to date -Remember to update the [Omnifixture SQL dump](https://github.com/piwik/piwik/blob/master/tests/resources/OmniFixture-dump.sql.gz) whenever you make any change to any fixture. -For instance use: +Remember to update the [Omnifixture SQL dump](https://github.com/piwik/piwik/blob/master/tests/resources/OmniFixture-dump.sql.gz) whenever you make any change to any fixture. You can use: ./console tests:setup-fixture OmniFixture --sqldump=OmniFixture-dump.sql - -and then gzip. + cat OmniFixture-dump.sql | gzip > tests/resources/OmniFixture-dump.sql.gz Keeping the OmniFixture up to date makes it easier to see which tests fail after each small fixture change. diff --git a/tests/UI/expected-ui-screenshots b/tests/UI/expected-ui-screenshots -Subproject ad20ff37e799248e5815c7ddaa5ee758e9cdda9 +Subproject 86f1eb250259e269be94b39021c9c9fc6063a00 diff --git a/tests/resources/OmniFixture-dump.sql.gz b/tests/resources/OmniFixture-dump.sql.gz Binary files differindex c8e5e1c72b..5466a04b88 100644 --- a/tests/resources/OmniFixture-dump.sql.gz +++ b/tests/resources/OmniFixture-dump.sql.gz diff --git a/tests/resources/access-logs/fake_logs_custom.log b/tests/resources/access-logs/fake_logs_custom.log index 85f4655d9b..2134ff1f74 100644 --- a/tests/resources/access-logs/fake_logs_custom.log +++ b/tests/resources/access-logs/fake_logs_custom.log @@ -2,9 +2,9 @@ 175.41.192.40 - - [30/Sep/2012:10:11:30 +0200] 200 "GET /faq/ HTTP/1.1" 234002 175.41.192.40 - - [30/Sep/2012:10:11:56 +0200] 200 "GET /blog/category/community/ HTTP/1.1" 1324002 175.41.192.40 - - [30/Sep/2012:10:12:03 +0200] 200 "GET /docs/manage-websites/ HTTP/1.1" 543002 -175.41.192.40 - - [30/Sep/2012:10:10:38 +0200] 200 "GET /blog/category/meta/ HTTP/1.1" 120002 +175.41.192.40 - - [30/Sep/2012:10:10:40 +0200] 200 "GET /blog/category/meta/ HTTP/1.1" 120002 175.41.192.40 - - [30/Sep/2012:10:11:30 +0200] 200 "GET /faq/ HTTP/1.1" 294002 175.41.192.40 - - [30/Sep/2012:10:11:56 +0200] 200 "GET /blog/category/community/ HTTP/1.1" 624002 -175.41.192.40 - - [30/Sep/2012:10:12:03 +0200] 200 "GET /docs/manage-websites/ HTTP/1.1" 343002 -175.41.192.40 - - [30/Sep/2012:10:10:38 +0200] 200 "GET /blog/category/meta/ HTTP/1.1" 23002 +175.41.192.40 - - [30/Sep/2012:10:12:04 +0200] 200 "GET /docs/manage-websites/ HTTP/1.1" 343002 +175.41.192.40 - - [30/Sep/2012:10:10:41 +0200] 200 "GET /blog/category/meta/ HTTP/1.1" 23002 175.41.192.40 - - [30/Sep/2012:10:11:30 +0200] 200 "GET /faq/ HTTP/1.1" 237002
\ No newline at end of file |