Commit Graph

410 Commits

Author SHA1 Message Date
Matthias Jentsch fdfad34e5c Do not normalize configuration keys to nested arrays in IniWriter
More than one nesting level (the section) is no longer allowed in configuration files. Dots in keys are now
part of the key and will not lead to a nested configuration.

fixes #7120
2014-11-11 15:05:34 +01:00
Johannes Meyer af99f62843 Prefer Icinga\Application\Config over Zend_Config
refs #7163
2014-11-11 12:11:14 +01:00
Johannes Meyer 9d292269b1 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/Resource/LdapResourceForm.php
	test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
2014-11-11 09:44:11 +01:00
Johannes Meyer 7b99b74ae1 Prefer Icinga\Application\Config instead of Zend_Config
refs #7147
2014-11-07 13:53:03 +01:00
Johannes Meyer 4537b2932e Fix that current(), key(), etc does not work with Config objects 2014-11-07 13:37:09 +01:00
Johannes Meyer 83f386f92a Do not extend Zend_Config in Icinga\Application\Config
refs #7147
fixes #7580
2014-11-06 15:41:31 +01:00
Johannes Meyer 170ded6510 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	library/Icinga/Authentication/Backend/LdapUserBackend.php
	library/Icinga/File/Ini/IniWriter.php
2014-11-04 14:22:53 +01:00
Eric Lippmann b38e3affb9 Move INI writer classes to the File namespace
fixes #7150
2014-10-31 10:54:53 +01:00
Eric Lippmann 16352fc10c Move Logger to the Application namespace
fixes #7148
2014-10-31 10:27:17 +01:00
Johannes Meyer c1bff9a26e Merge branch 'master' into feature/setup-wizard-7163 2014-10-30 10:38:21 +01:00
Eric Lippmann 1b83ec3ce2 Preferences: Fix saving preferences when using a database store
Our DbSelect::where() is not (or no longer?) compatible w/ Zend_Db_Select::where().
DbStore::load() now uses Zend_Db_Select but we should definitely think about our
DbSelect::where() implementation.

fixes #7353
2014-10-30 09:49:21 +01:00
Johannes Meyer 9f127be1dc Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/General/LoggingConfigForm.php
2014-10-17 13:04:59 +02:00
Eric Lippmann 501aca42b9 Logger: Fix the StreamWriterTest 2014-10-16 15:58:37 +02:00
Johannes Meyer 1cbe2451a8 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/Resource/StatusdatResourceForm.php
2014-10-08 16:34:31 +02:00
Eric Lippmann ebde422824 filter: Fix whitepsace sanitation when expression is an array 2014-10-01 04:00:43 +02:00
Eric Lippmann 56a1af47e7 filter: Add test for whitespace sanitizing 2014-10-01 03:23:06 +02:00
Johannes Meyer cbadaa78d6 Merge branch 'master' into feature/setup-wizard-7163 2014-09-29 15:35:52 +02:00
Johannes Meyer 07d25e8bed Fix form tests 2014-09-29 12:56:36 +02:00
Johannes Meyer 0e92e333aa Make isValid* calls of configuration forms being static
This allows a more flexible usage as there is no need to access instance
formdata when validating such configuration.
2014-09-29 11:02:45 +02:00
Alexander Fuhr c8a24f72b8 Introduce getValue() in Preferences and fix the loading of values 2014-09-26 14:15:50 +02:00
Johannes Meyer 635b802a2b Add tests for hasChanged, set/getByRef and fix setByRef 2014-09-24 10:46:35 +02:00
Johannes Meyer 6f988cb94c Remove method write() from Icinga\Web\Session\SessionNamespace 2014-09-24 10:46:35 +02:00
Eric Lippmann cde3ec6bc8 Merge branch 'master' into bugfix/commands-6593
Conflicts:
	modules/monitoring/application/controllers/TimelineController.php
2014-09-23 22:54:17 -07:00
Alexander Fuhr 07a4b25560 Merge branch 'master' into bug/history-notification-time-format-6980 2014-09-23 11:38:24 +02:00
Alexander Fuhr e784aa34b6 Implement DateTimeRenderer and fix history time format
refs #6980
2014-09-23 11:36:09 +02:00
Eric Lippmann c51b05296e Merge branch 'master' into bugfix/commands-6593 2014-09-19 13:18:47 +02:00
Eric Lippmann af58732545 Introduce `User::can()' for checking whether a user has a given permission
The authentication manager already has the `hasPermission()' method but it lacks wildcard support
and uses stupid looping. Implementing this method on the user further saves a call to `User::getPermissions()'.
2014-09-18 14:37:18 +02:00
Eric Lippmann d10afa1f9b Remove the command pipe tests 2014-09-17 12:59:45 +02:00
Eric Lippmann f640874865 monitoring: Fix DateTimePicker test 2014-09-17 12:40:41 +02:00
Alexander Fuhr 0be8b97e88 Extend TranslatorTest with new tests
refs #6982
2014-09-16 16:14:07 +02:00
Eric Lippmann 8bf66425d1 Merge branch 'master' into bugfix/commands-6593 2014-09-15 09:27:56 +02:00
Thomas Gelf 3a5415f7c8 test/Web/Hook: refactor without mocks
Mocks made no sense here. Also introduced a "new" way of naming test
functions. Output now looks as follows:

s\Icinga\Web\Hook
 [x] Knows which hooks are registered
 [x] Correctly handles multiple instances
 [x] Returns null for invalid hooks
 [x] Returns null for failing hook
 [x] Checks whether created instances inherit base classes
 [x] Throws errors for instances not inheriting base classes
 [x] Creates identical instances only once
 [x] Returns an empty array with no registered hook
2014-09-12 09:07:27 +02:00
Johannes Meyer 0693e7cf2d Fix ResourceForm tests
refs #5525
2014-09-09 13:06:30 +02:00
Johannes Meyer 40947acd16 Fix, rename and move ReorderFormTest
refs #5525
2014-09-09 12:02:51 +02:00
Johannes Meyer 7dbc83e21f Drop obsolete BaseBackendFormTest
refs #5525
2014-09-09 11:58:07 +02:00
Johannes Meyer e4fccdd150 Fix DbBackendFormTest
refs #5525
2014-09-09 10:39:49 +02:00
Johannes Meyer 31978e1236 Fix LdapBackendFormTest
refs #5525
2014-09-09 10:36:42 +02:00
Johannes Meyer cee3c32fa5 Fix dashboard tests utilizing BaseTestCase::setupIcingaMock() 2014-09-09 10:21:37 +02:00
Johannes Meyer a5c027b77c Fix UrlTest utilizing BaseTestCase::setupIcingaMock() 2014-09-09 10:21:09 +02:00
Johannes Meyer 6525d6933a Add test for Icinga\Web\Form
refs #5525
2014-09-09 09:40:49 +02:00
Alexander Fuhr ab71b1cf1c Update TranslatorTest: adjust systemwide locales order 2014-09-05 10:53:56 +02:00
Alexander Fuhr ba623d0544 SearchDashboard: adjust SearchDashboardTest and rename searchQuery to searchString 2014-09-04 22:54:41 +02:00
Thomas Gelf 0f7f2f2d8b SearchDashboard: rename ::load() to ::search()
Function signature didn't match parent factory function

fixes #7081
2014-09-04 19:35:31 +02:00
Thomas Gelf dd943c3aa7 Web\UrlTest: test the new matches() function
refs #6992
2014-09-04 18:59:22 +02:00
Thomas Gelf 97cfeaa3df SessionNamespaceTest: expect the correct exception 2014-09-04 18:39:02 +02:00
Thomas Gelf 3d170f90a5 TranslatorTest: expect the correct exception 2014-09-04 18:39:02 +02:00
Thomas Gelf 0cc024a30a DateFormatTest: disable it as it is broken 2014-09-04 18:39:02 +02:00
Thomas Gelf 5314e57b0f ResourceFormTest: disable, messed up 2014-09-04 18:39:02 +02:00
Alexander Fuhr e4d1143870 Add SearchDashboardTest 2014-09-04 18:31:08 +02:00
Thomas Gelf 4513ab2aed GraphChartTest: match current implementation
We have more nodes right now as of a graphical hack (white bg)
2014-09-04 17:57:02 +02:00
Thomas Gelf 5a29315ee8 Web\UrlTest: make tests fit current implementation
* temporarily disable [] tests
* getAbsoluteUrl uses & and not & by default
* __toString uses & and does not match getAbsoluteUrl by default
* addParams MUST hide existing ones, getValues still ships them

fixes #6604
2014-09-04 17:35:55 +02:00
Marius Hein 0935a8e340 DateFormatTest: Remove dependencies to global/user config
refs #6077
2014-09-04 16:02:10 +02:00
Alexander Fuhr 1d81211427 Move DashboardTest in correct directory
resf #6986
2014-09-03 15:13:16 +02:00
Thomas Gelf 65fb246b7e FilterTest: fix complex filter example
The filter in the test was not a valid filter.

fixes #7069
2014-09-03 15:03:24 +02:00
Alexander Fuhr acbd2bd7c0 Merge branch 'master' into feature/dashboard-component-disabled-property-6986 2014-09-03 14:40:30 +02:00
Alexander Fuhr 7cfc051228 Add tests for Dashboard and fix doc blocks
refs #6986
2014-09-03 14:36:04 +02:00
Johannes Meyer 3f9cb00b1f Fix DbBackendFormTest not creating a valid ResourceFactory mock object
refs #7063
2014-09-03 10:00:41 +02:00
Johannes Meyer 8e5deb8029 Fix TranslatorTest not expecting the default locale as being "available"
refs #7063
2014-09-03 10:00:04 +02:00
Marius Hein ee6145a173 Ldap/Query: Remove __toString()
This is needed because of exception handling. Exceptions can now bubble
up for default handling. Method render() was renamed to create() because
the method create a query. Adjust the test for method create().

refs #5536
2014-09-02 10:17:01 +02:00
Marius Hein 4e83bb098a LdapBackendFormTest: Fix mock
refs #5514
2014-08-28 12:14:55 +02:00
Marius Hein 22e17e9901 ResourceFactory: Move available function to platform
refs #5514
2014-08-28 12:14:54 +02:00
Alexander Klimov 7ff51caed0 Remove leading backslashes from the targets of use statements
- use \Exception;
+ use Exception;
2014-08-27 15:51:49 +02:00
Eric Lippmann 1dea19504f Revert "Remove leading backslashes from the targets of use statements"
This reverts commit 87a5967501.

At least 'modules/doc/run.php' issues a warning about "The use statement with non-compound name 'Zend_Controller_Router_Route' has no effect"
2014-08-27 12:24:11 +02:00
Alexander Klimov 87a5967501 Remove leading backslashes from the targets of use statements
- use \Exception;
+ use Exception;
2014-08-27 11:16:44 +02:00
Marius Hein 5abf41edef Hook/ConfigurationTab: Remove deprecated implementation
ConfigurationTab hook is not used anywhere. Test is
removed also.
2014-08-27 10:29:04 +02:00
Matthias Jentsch 1aa95b054c Add unit tests for nested-key handling in the PreservingIniWriter
fixes #6381
2014-08-26 18:31:19 +02:00
Thomas Gelf cd825a4e6b tests/ScrollingStyle: adjust, pagination shortened
Pagination has been "shortened" some time ago to waste less space,
tests now fit the current implementation.

fixes #6594
fixes #6595
2014-08-19 12:45:42 +02:00
Thomas Gelf 3f65f3447d Web\UrlTest: test should use %20 instead of +
We MUST use rawurlencode everywhere to avoid potential conflicts with
URLs created on JS side.

refs #6604
2014-08-19 12:39:53 +02:00
Johannes Meyer f2ed813c9a Fix that Icinga\Web\Url::fromPath drops fragments
fixes #6284
2014-08-14 14:23:31 +02:00
Johannes Meyer 3105c2059e Remove license headers from all files
refs #6309
2014-07-15 13:43:52 +02:00
Matthias Jentsch fa61b601d4 Test whether section comments are moved correctly 2014-07-04 11:35:00 +02:00
Matthias Jentsch e78f01591d Fix PreservingIniWriterTest section test case
The test case now tests whether the section order of the ini file is updated correctly and
not whether the section order is preserved

fixes #6625
2014-07-03 17:26:55 +02:00
Matthias Jentsch 86ad5f738b Fix LdapBackendFormTest
Alter class mocks to fit the latest changes in LdapBackendFormTest

fixes #6597
2014-07-03 16:15:02 +02:00
Johannes Meyer 8eac449d56 Adjust the test for Icinga\Web\MenuItem as its test subject has changed
refs #6153
2014-07-03 15:14:47 +02:00
Eric Lippmann 8727c9b91d Revert "tests: Fix path to `extcmd_test'"
This reverts commit 4054bcf101.

The changed path to `extcmd_test' is actually invalid because `extcmd_test' is located beneath `<icingaweb>/modules/test/bin'.
I erroneously assumed the latter as invalid because the compiled `extcmd_test' was missing.
2014-07-02 12:18:15 +02:00
Eric Lippmann 4054bcf101 tests: Fix path to `extcmd_test'
The path to `extcmd_test' is now `<icingaweb>/test/php/extcmd_test' instead of being relative to the current directory.

refs #6542
2014-07-02 11:09:04 +02:00
Eric Lippmann 545a153490 Merge branch 'master' into bugfix/test-fix-6542 2014-07-02 10:57:08 +02:00
Matthias Jentsch dc20973581 Fix ResourceFormTest
Add function-mock for mysqlAvaialable to prevent the unit test from breaking
2014-06-30 18:20:19 +02:00
Matthias Jentsch 8f1959833b Fix the DbBackendFormTest
Mock ResourceFactory in form tests

fixes #6596
2014-06-30 18:20:19 +02:00
Johannes Meyer 7eb0f3c472 Remove @codingStandardsIgnoreStart/-Stop annotations
refs #6091
2014-06-30 13:59:58 +02:00
Alexander Klimov 5b79d6e4a7 Do not expect a particular exception message
refs #6542
2014-06-30 13:33:17 +02:00
Johannes Meyer 54f9ecb62f Add extcmd_test binary to gitignore and skip tests when its not available 2014-06-30 08:56:48 +02:00
Alexander Klimov 572c7858c8 Remove test Tests\Icinga\Web\Paginator\ScrollingStyle\SlidingwithborderTest::testGetPages1 because it tests a non-present feature
refs #6542
2014-06-27 14:30:58 +02:00
Alexander Klimov b2ffa2aa89 Remove Test\Icinga\Web\Paginator\Adapter\QueryAdapterTest because the test tests a non-present feature
refs #6542
2014-06-27 14:30:57 +02:00
Alexander Klimov 6ccebf45c8 Fix test Tests\Icinga\Form\Config\Resource\ResourceFormTest because the method being tested has been changed
refs #6542
2014-06-27 14:30:57 +02:00
Alexander Klimov 23baa0dc83 Fix test Icinga/File/CsvTest.php because the method being tested has been changed
refs #6542
2014-06-27 14:30:57 +02:00
Johannes Meyer 3b191d36c4 Let Icinga\Util\File extend from SplFileObject
We should extend SplFileObject as it provides already some of the
functionality Icinga\Util\File had and adds even more on top of that.
2014-06-26 15:57:14 +02:00
Johannes Meyer 461b050718 Add locale negotiation to Icinga\Util\Translator
Translator::getPreferredLocaleCode($header) can now be used with the
HTTP "Accept-Language" header to return the best matching locale using
the user's preferations reported by the browser and our available locale
stack. Additionally Translator::getLocale and Translator::getLanguage were
replaced by Translator::splitLocaleCode to provide a more flexible
implemenation in order to identify specific parts of a particular locale or
the current one.

refs #6074
2014-06-25 12:15:41 +02:00
Thomas Gelf 40a3c0d19b FilterTest: add notes for future tests
Also removed forgotten sample code
2014-06-25 11:14:32 +02:00
Thomas Gelf b3cdeee35d monitoring/timeline: should benefit from new filter
Different changes have been applied:

* Allow integer unix timestamps as parameters for timestamp columns
* Remove alias-rewriting from Url class
* Remove all traces of raw_timestamp
* Use new filters
2014-06-21 03:09:40 +02:00
Thomas Gelf e3e6826d9d Icinga\Filter: remove 2014-06-17 13:26:57 +00:00
Thomas Gelf d2ccc68214 Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018
Conflicts:
	modules/monitoring/application/controllers/ListController.php
2014-06-17 09:47:14 +00:00
Johannes Meyer 32a7decc3e Remove python test-runners
refs #6092
2014-06-12 16:29:07 +02:00
Johannes Meyer d28d20696c Move binary testing stuff and phpunit.xml to its own module
refs #6092
2014-06-12 16:29:07 +02:00
Johannes Meyer 159d765f14 Fix that calling ActionController::translate() throws an exception
Translating strings must not throw an exception
even if the given domain is not valid.

fixes #6432
2014-06-11 13:39:22 +02:00
Thomas Gelf db3accc704 Data\Db: rename Query and Connection to Db...
Class names in namespaces should not be chosen as once we didn't have
such. The fact that we already did "use Db\Connection as DbConnection"
is the best hint that naming was wrong.

So this patch renames Db\Connection to Db\DbConnection and does the
same with DbQuery. DbQuery has been adjusted to fit our new SimpleQuery
and to handle the new Filter implementation.
2014-06-06 06:43:13 +00:00
Thomas Gelf f438cb30e1 Data\Filter: initial commit basic implementation
Basic operators are there, still missing: subclassed "where" to distinct
comparison operators like greater/less than on a class level.

refs #6418
2014-06-06 06:04:24 +00:00
Thomas Gelf 6b0a212094 tests/Data: implement basic data filtering tests
First test examples, more to come
2014-06-06 05:42:02 +00:00
Thomas Gelf bfe6a1593a Merge remote-tracking branch 'origin/master' into feature/query-interfaces-6018 2014-06-06 05:32:54 +00:00
Thomas Gelf 55880cb5a3 packaging/config: rename ICINGA_APPDIR
Renamed ICINGA_APPDIR to ICINGAWEB_APPDIR for consistency. This way
it fits ICINGAWEB_CONFIGDIR.

refs #6400
2014-06-04 21:11:27 +00:00