Marcus Moore
56e6205667
Formatting
2023-09-07 12:45:03 -07:00
Marcus Moore
899c2eb19b
Implement test case
2023-09-07 12:34:50 -07:00
Marcus Moore
1c3c36f2a0
Begin to implement patch test
2023-09-06 16:14:14 -07:00
snipe
a62e2f092b
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report
...
Added last check in column and filter to custom asset report
2023-09-05 13:22:15 +01:00
snipe
e192cbbbe1
Merge pull request #13550 from marcusmoore/remove-dusk
...
Removed Dusk
2023-08-31 18:06:04 +01:00
Marcus Moore
a799659610
Scaffold tests and add context
2023-08-30 17:33:23 -07:00
Marcus Moore
999605f832
Add failing test
2023-08-30 17:10:50 -07:00
Marcus Moore
5828d29952
Remove Dusk
2023-08-30 16:43:18 -07:00
snipe
fb455be406
Added tests
...
Signed-off-by: snipe <snipe@snipe.net>
2023-08-30 19:13:38 +01:00
Marcus Moore
07c3fe1fce
Update assertions to account for type change
2023-08-30 09:42:53 -07:00
Marcus Moore
aafa1ab70e
Add failing test
2023-08-29 16:15:13 -07:00
Marcus Moore
c332b98456
Add last checkin options to report front end
2023-08-21 13:44:49 -07:00
Marcus Moore
6fc06f2ee1
Add simple tests around asset check in
2023-08-21 12:31:51 -07:00
snipe
6adaa32286
Merge pull request #13431 from marcusmoore/feature/custom-report-scoping
...
Removed unneeded `Company::scopeCompanyables` from `ReportsController`
2023-08-10 09:57:53 +01:00
snipe
a599f0c923
Merge pull request #13434 from marcusmoore/chore/improve-test-stability
...
Improved test stability and messaging
2023-08-10 09:57:26 +01:00
Marcus Moore
04661d5441
Add help text to response assertion helpers
2023-08-09 17:09:31 -07:00
Marcus Moore
3a5ed031bf
Escape values in response assertion helpers
2023-08-09 17:08:49 -07:00
Marcus Moore
60baaae192
Remove unused test bootstrap file
2023-08-09 16:22:58 -07:00
Marcus Moore
8508594a2f
Remove old and unused Codeception test code
2023-08-09 13:32:15 -07:00
Marcus Moore
e0b464dcec
Merge branch 'develop' into feature/custom-report-scoping
2023-08-09 13:03:05 -07:00
snipe
a6a742d8d8
Merge pull request #13407 from marcusmoore/feature/sc-23465
...
Added messaging to category edit page to improve clarity around when users will be emailed
2023-08-09 10:36:19 +01:00
Marcus Moore
2e632a3d2d
Improve test readability
2023-08-08 17:40:02 -07:00
Marcus Moore
c752e1670c
Add test around company scoping in custom report
2023-08-08 17:21:39 -07:00
Marcus Moore
1405e17251
Add simple test around custom asset report response
2023-08-08 17:10:36 -07:00
Marcus Moore
42055bb69d
Add authentication and authorization tests for department index method
2023-08-07 17:42:28 -07:00
Marcus Moore
cdfe8e459d
Add simple test cases for api department index
2023-08-07 16:36:01 -07:00
Marcus Moore
3fd0853fd0
Ensure eula field enabled when not using default eula
2023-08-02 18:02:56 -07:00
Marcus Moore
896f038054
Set send email back to original value when eulas cleared
2023-08-02 17:03:56 -07:00
Marcus Moore
48979ce177
Disable send email when it should not be modified
2023-08-02 16:52:56 -07:00
Marcus Moore
e12935f7fa
Disable eula textarea when using global eula
2023-08-02 16:18:57 -07:00
Marcus Moore
6400034435
Improve variable name
2023-08-02 16:06:59 -07:00
Marcus Moore
269414e4f2
Automatically check the send email to user checkbox in certain conditions
2023-08-02 16:04:01 -07:00
Marcus Moore
dee6ebf8e0
Scaffold component test
2023-08-02 12:58:07 -07:00
snipe
c1949ffb0d
Merge pull request #13319 from marcusmoore/chore/user-search-test-cases
...
Added test cases around user search
2023-07-18 13:27:22 +01:00
snipe
18e2ec4dad
Merge pull request #13310 from marcusmoore/bug/sc-23478
...
Fixed the inability to load location select when editing profile
2023-07-18 13:26:30 +01:00
Marcus Moore
fa0a88289a
Add tests around user search
...
Follow up to #13311
2023-07-17 11:29:22 -07:00
Marcus Moore
346ace9444
Allow users that have permission to edit their own location to see locations in select list
2023-07-13 17:37:46 -07:00
snipe
981c3a430d
Merge pull request #13301 from uberbrady/better_auto_increment_tags
...
Better auto increment asset-tags [FD-32892]
2023-07-13 09:49:44 +01:00
Brady Wetherington
e648da9dc5
Also do a sanity-check that the normal asset autoincrementing works
2023-07-12 16:51:23 +01:00
Brady Wetherington
76191a09ed
Improvements to asset_tag auto-incrementing, with auto-fixups for gaps
2023-07-12 16:39:45 +01:00
Marcus Moore
48e4ec8cf5
Guard against wiping database when running tests and test specific envs are not created
2023-07-11 12:16:37 -07:00
Marcus Moore
2abdb8a5fd
Revert unneeded changes
2023-06-26 14:01:09 -07:00
Marcus Moore
7cb22d3d49
Remove incomplete tests
2023-06-26 14:00:53 -07:00
Marcus Moore
acd06927ac
Add helper method for authenticating with passport
2023-06-22 17:37:30 -07:00
Marcus Moore
a35d83d14a
Migrate to response macros for readability
2023-06-22 14:41:56 -07:00
Marcus Moore
a333d7b72f
Add context to incomplete tests
2023-06-22 12:48:09 -07:00
Marcus Moore
ab5fed09db
Remove scopeCompanyables call from AssetsController@requestable
2023-06-22 12:36:43 -07:00
Marcus Moore
74b072f1b5
Improve messaging in testing helper
2023-06-22 12:36:30 -07:00
Marcus Moore
0a5e1e3190
Remove scopeCompanyables call from AssetsController@selectlist
2023-06-21 17:21:36 -07:00
Marcus Moore
effd969284
Scaffold test before removing scopeCompanyables call from AssetsController@selectlist
2023-06-21 17:15:02 -07:00
Marcus Moore
af77fefc61
Scaffold test before removing scopeCompanyables call from AssetsController
2023-06-21 16:19:56 -07:00
Marcus Moore
65e8e4e163
Guard against attempting to use invalid property
2023-06-21 16:18:09 -07:00
Marcus Moore
7672861b96
Scaffold test before removing scopeCompanyables call from DashboardController
2023-06-07 17:38:23 -07:00
Marcus Moore
6f5252449e
Scaffold test before removing scopeCompanyables call from UsersController
2023-06-07 16:25:18 -07:00
Marcus Moore
0f6051bbe5
Inline method call
2023-06-07 16:18:02 -07:00
Marcus Moore
abaf59c990
Extract and use helper methods
2023-06-07 16:16:30 -07:00
Marcus Moore
27d4d107bb
Scaffold test before removing scopeCompanyables call from DepartmentsController
2023-06-07 16:10:29 -07:00
Marcus Moore
8e6e525b47
Remove scopeCompanyables call from LicensesController
2023-06-07 16:09:45 -07:00
Marcus Moore
a18f5e7fc0
Remove scopeCompanyables call from ConsumablesController
2023-06-07 14:22:22 -07:00
Marcus Moore
48850f3597
Remove scopeCompanyables call from ComponentsController
2023-06-06 18:02:18 -07:00
Marcus Moore
6585aa0cf0
Add unit tests for company scoping
2023-06-06 16:31:14 -07:00
Marcus Moore
6300909fee
Add test for searching for user's first and last name
2023-05-23 13:39:01 -07:00
Marcus Moore
9cb0decf35
Adapt multiple column search based on database driver
2023-05-18 12:54:00 -07:00
snipe
d70e14de61
Merge pull request #12972 from marcusmoore/bug/sc-23177
...
Fixes user name missing in accessory acceptance notifications
2023-05-08 13:04:37 -07:00
Marcus Moore
4a0b3efd1f
Include user's name in Acceptance result notifications for accessories
2023-05-03 14:22:05 -07:00
snipe
b716f9f55e
Merge pull request #12916 from snipe/features/auto_add_to_fieldset
...
Added ability to auto-add fields to new fieldsets
2023-05-03 11:04:33 -07:00
Marcus Moore
f7d2b62d87
Improve method name
2023-05-01 16:06:28 -07:00
Marcus Moore
da08f6ef8c
Add InteractsWithSettings trait to required tests
2023-05-01 16:05:26 -07:00
Marcus Moore
6d594faae7
Clear the settings cache on app destruction
2023-05-01 16:04:43 -07:00
snipe
970b5e556c
Merge pull request #12903 from marcusmoore/bug/sc-15034
...
Fixes sending webhook notifications for checkout and checkin
2023-04-25 22:22:58 -07:00
snipe
27477085fe
Merge branch 'develop' into features/auto_add_to_fieldset
2023-04-25 21:31:50 -07:00
snipe
4a063d23b9
We don’t actually use this test?
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-25 19:36:52 -07:00
Marcus Moore
a528ebeab0
Use superuser instead of admin state
2023-04-25 11:53:47 -07:00
Marcus Moore
2aba8252f3
Ensure users editing themselves do not deactivate their account
2023-04-20 21:59:55 -07:00
Marcus Moore
c357d9f01e
Update data provider name
2023-04-19 18:10:23 -07:00
Marcus Moore
bad2eead4c
Remove test method
2023-04-18 13:13:57 -07:00
Marcus Moore
508660b1df
Skip notifications for component checkouts and checkins
2023-04-18 13:07:55 -07:00
Marcus Moore
f6cff90829
Migrate to new test settings interface
2023-04-17 17:31:12 -07:00
Marcus Moore
2d56675ade
Merge branch 'develop' into bug/sc-15034
...
# Conflicts:
# database/factories/SettingFactory.php
2023-04-17 17:22:55 -07:00
Marcus Moore
473241edca
Move initialization of settings to trait
2023-04-13 16:52:20 -07:00
Marcus Moore
7c95e45178
Introduce trait to conditionally interact with settings
2023-04-12 17:28:47 -07:00
Marcus Moore
cd0796ddda
Allow Settings to be chainable
2023-04-06 18:46:29 -07:00
Marcus Moore
9561b66613
Add return types and docblock
2023-04-06 17:58:53 -07:00
Marcus Moore
95f195046d
Move cache flush to testing helper
2023-04-06 17:50:24 -07:00
Marcus Moore
52c733b31d
Add ability to set provided settings
2023-04-06 17:48:23 -07:00
Marcus Moore
8ac4d3aeea
Move to a static constructor
2023-04-06 17:42:15 -07:00
Marcus Moore
bbfb6c338a
Remove unused method
2023-04-06 17:28:16 -07:00
Marcus Moore
f767cc082f
Introduce improved way to interact with settings in tests
2023-04-06 17:27:18 -07:00
Marcus Moore
5b4d5cadf4
Add tests for sending webhooks on asset and license seat checkin
2023-04-05 12:57:53 -07:00
Marcus Moore
3cc3662992
Send webhook notifications for accessory checkins when enabled
2023-04-05 12:36:24 -07:00
Marcus Moore
2187310abb
Simplify test case names
2023-04-05 12:27:18 -07:00
Marcus Moore
b41902976b
Improve test class names
2023-04-05 12:23:11 -07:00
Marcus Moore
524249d4d7
Implement tests for webhook notifications on accessory checkout
2023-03-30 16:58:16 -07:00
Marcus Moore
b2292db3c8
Implement tests for webhook notifications on consumable checkout
2023-03-30 16:40:53 -07:00
Marcus Moore
aefc53cfcf
Explicitly disable webhook settings in tests
2023-03-30 16:40:21 -07:00
Marcus Moore
134ab631d4
Add test to ensure notification is not sent for license checkouts if not enabled
2023-03-30 15:38:22 -07:00
Marcus Moore
158e1544cd
Test the event instead of the checkout
2023-03-30 15:38:00 -07:00
Marcus Moore
2cbc6276f7
Implement test for license checkout notification
2023-03-27 14:09:31 -07:00
Marcus Moore
fa69a580ab
Start to scaffold license checkout notification test
2023-03-23 17:18:33 -07:00
Marcus Moore
25e859c866
Simplify test case
2023-03-23 16:42:21 -07:00
Marcus Moore
2dcf4e3d16
Standardize on sending anonymous notifications for asset checkouts
2023-03-23 16:31:40 -07:00
Marcus Moore
b396f2bed3
Update test case names
2023-03-22 12:41:30 -07:00
Marcus Moore
28ced46b9d
Clean up test code
2023-03-22 12:38:14 -07:00
Marcus Moore
66224765ea
Use factory state for webhook settings
2023-03-22 12:31:47 -07:00
Marcus Moore
9c4a3ce56a
Update slack_endpoint to webhook_endpoint in test and notification
2023-03-22 12:27:36 -07:00
Marcus Moore
f6d0dd0f93
Merge branch 'develop' into bug/sc-15034
2023-03-22 11:58:47 -07:00
Marcus Moore
e303aeadd1
Fix test name
2023-03-22 11:56:54 -07:00
Marcus Moore
315f5231cd
Send slack notification for check outs to assets and locations
2023-03-21 17:03:51 -07:00
Marcus Moore
918239961a
Add simple test case for assets
2023-03-20 15:47:57 -07:00
Marcus Moore
272cc1adac
Skip creating user when creating a setting since it isn't needed
2023-03-20 15:33:40 -07:00
Marcus Moore
16e3416225
Update test case
2023-03-20 14:27:45 -07:00
Marcus Moore
099ec3f550
Remove creation of category within category factory state
2023-03-13 16:45:43 -07:00
Marcus Moore
2813b7ea58
Scaffold tests for slack notification on checkout
2023-03-13 15:47:50 -07:00
Marcus Moore
dd9c00195b
Remove old $tester variable and usused imports
2023-03-07 17:04:46 -08:00
Marcus Moore
43ff7261b2
Remove redundant base test case
2023-03-07 16:57:55 -08:00
Marcus Moore
8c13a4c5c9
Use LazilyRefreshDatabase instead of RefreshDatabase
2023-03-07 16:43:18 -08:00
Marcus Moore
8fad377114
Remove helper methods by inlining where needed
2023-03-07 10:28:33 -08:00
Marcus Moore
a3c8c3757a
Remove unused method
2023-03-06 17:50:44 -08:00
Marcus Moore
bc54144284
Fix test by passing proper user
2023-03-06 12:40:47 -08:00
Marcus Moore
e8da6d8bac
Set purchase date in correct format
2023-03-02 13:47:58 -08:00
Marcus Moore
45d7e9b134
Switch to using LazilyRefreshDatabase in unit test suite
2023-03-02 13:13:30 -08:00
Marcus Moore
75fc624ec6
Globally disable SecurityHeaders in tests
2023-03-02 13:12:25 -08:00
Marcus Moore
589a5d0d8b
Merge branch 'develop' into fix/test-suite
2023-02-28 09:48:48 -08:00
snipe
eb6357636a
Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies
...
Fix full company scoping in user selects
2023-02-23 10:36:33 -08:00
Marcus Moore
4f9ebf6cde
Fix array key
2023-02-07 16:40:27 -08:00
Marcus Moore
787f619a6b
Standardize test method syntax
2023-02-07 16:28:40 -08:00
Marcus Moore
505ca48da2
Remove test method without assertions
2023-02-07 16:17:36 -08:00
Marcus Moore
6b8c0f9e88
Make BaseTest abstract
2023-02-07 16:17:16 -08:00
Marcus Moore
6dbcec2310
Exclude Dusk tests from phpunit test suite
2023-02-07 16:16:39 -08:00
Marcus Moore
c03079944a
Be more explicit in test case
2023-02-06 16:06:13 -08:00
Marcus Moore
9a0c66bd30
Clear some extra lines
2023-02-02 18:30:18 -08:00
Marcus Moore
d8e92d29c0
Improve readability
2023-02-02 18:25:54 -08:00
Marcus Moore
93a62c87c2
Implement test for searching users
2023-02-02 17:57:24 -08:00
Marcus Moore
89eff23e44
Continue implementing tests
2023-02-02 17:41:32 -08:00
Marcus Moore
a2e47d19fc
Scaffold tests for user select list api and begin to implemenet
2023-02-02 13:47:00 -08:00
Marcus Moore
bc0f666906
Create Setting in test to avoid being redirected to the setup screen
2023-01-10 17:03:09 -08:00
Marcus Moore
581655f756
Run database migrations for all Dusk tests
2023-01-10 17:02:11 -08:00
Chris Hartjes
07585809b3
Got unit and browser tests working, added documentation
2022-08-12 13:00:26 -04:00
snipe
e7541f29d2
Use php artisan serve url
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-18 14:50:24 -08:00
snipe
66ed311914
Fixed asset maintenances test
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 20:14:39 -08:00
snipe
f334bf1058
Fixed notification tests
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 20:01:03 -08:00
snipe
0104f35f31
Fixed Component Test, commented Consumables
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 19:43:15 -08:00
snipe
222ee8e0bf
Slight refactor on depreciation test
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 19:36:07 -08:00
snipe
0e3bafd5b4
Fixed depreciation tests
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 19:19:42 -08:00
snipe
17bc562ac4
Commented out broken permissions and importer tests for now
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 19:19:35 -08:00
snipe
1e46fde5e2
Fixed status labels tests
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 19:01:57 -08:00
snipe
872bd29cb3
Removed repetitive tests
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 18:27:52 -08:00
snipe
21e2504f79
Trying unsuccessfully to get nested factories working
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 17:38:28 -08:00
snipe
5a01fff79c
Use the Setting model for basetest
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 17:37:51 -08:00
snipe
390e8a6cc3
Fixed company unit test
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 16:43:03 -08:00
snipe
b0d2fc787a
Fixed accessory test
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 16:33:16 -08:00
snipe
35ba28bff9
Continuing to refactor tests
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 16:14:45 -08:00
snipe
c2709be4a1
Removed pointless tests
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 16:14:23 -08:00
snipe
c949a1f5f2
renamed Tests to tests
2021-12-02 15:08:26 -08:00
snipe
5555553307
renamed again for git to accept case
2021-12-02 14:02:16 -08:00
snipe
00b63fe7c7
Fixed category factory methods
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-02 13:40:16 -08:00
snipe
ed2797afdd
Small fixes
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-01 23:33:20 -08:00
snipe
17bd6d71e7
Fixed location unit test
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-01 22:45:39 -08:00
snipe
bc355e1f26
Remve unused use Hash statements
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-30 20:47:02 -08:00
snipe
d8234d5a0b
Trying to unfuck the TestCase
...
A lot has changed between versions
Signed-off-by: snipe <snipe@snipe.net>
2021-11-30 20:46:44 -08:00
snipe
e73373a75a
Removed empty tests
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-30 20:45:42 -08:00
snipe
d08c1787a1
First steps at getting dusk working
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-30 20:09:29 -08:00
snipe
61f16f47a2
Use Helper alias
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-28 19:44:55 -07:00
Laravel Shift
b62d1f49e4
Shift cleanup
2021-06-10 20:19:27 +00:00
Laravel Shift
8b82262777
Shift return type of base TestCase methods
...
From the [PHPUnit 8 release notes][1], the `TestCase` methods below now declare a `void` return type:
- `setUpBeforeClass()`
- `setUp()`
- `assertPreConditions()`
- `assertPostConditions()`
- `tearDown()`
- `tearDownAfterClass()`
- `onNotSuccessfulTest()`
[1]: https://phpunit.de/announcements/phpunit-8.html
2021-06-10 20:18:12 +00:00
Laravel Shift
104b441e0d
Shift to class based factories
2021-06-10 20:17:44 +00:00
Laravel Shift
802dc9240d
Shift bindings
...
PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.
2021-06-10 20:16:56 +00:00
Laravel Shift
934afa036f
Adopt Laravel coding style
...
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.
You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.
[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
2021-06-10 20:15:52 +00:00
Marc Leuser
90b7d34c69
Added #6695 : add API endpoint for license seats ( #8058 )
...
* remove miselading comment line
* added dedicated API endpoint for license seats
* don't display a seat name via API
it makes no sense and we don't have any particular sorting order
so the numbering would be inconsistent anyway
* reduce amount of IFs
* add sanity checks to show()
* fix goofed logging logic
* add tests for action log entries
2021-03-29 19:41:26 -07:00
snipe
4a8a98a7d3
Fixed user test
2020-11-09 14:17:45 -08:00
snipe
9c8ca6af21
Squashed commit of the following:
...
commit e321aeabae8ec99ff4337568ae9e37568ae9ec01a83216932ad9050c#8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
commit 32ad9050cf01a832169cbcad49ce73c6883489#8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist
Fixed #8335 - added assignedTo scope on status labels API call for assetlist
commit 3c6883489cbcad49ce79b5acca89d7e52919cf1b714576be429f3a5c48#8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
commit 29f3a5c48f134e8e6fb9714576be45b999c50a2512899294#8328 from snipe/fix_deprecation_report
Fix deprecation report for customers with many active assets
commit 51289929400291323502e0f6f9b839f1a6308002b999c50a2e9ca20e496e3906b245#8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation
Looks great, thank you!
commit e3906b245c9ca20e4964e0644dbbf456a74d88#8313 from snipe/improve_ldap_search_error_reporting
Improve ldap search error reporting
commit 456a74d88c799c059070c62d43a778b725bd0faee0644dbbf65b6925b00004ecad05#8105 from PeterUpfold/PeterUpfold-7661workaround
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
commit 5b6925b00cdf17a859bf24c43056ba606b7e905dd73ddad4779a39cf721e7410b16838994f3e15#8258 from ballertv/features/consumable-api
This looks great, thank you!
commit 7410b16835e955c983ab09e7d19b#8270 from snipe/improve_ad_useraccountcontrol_v4
Add new useraccountcontrol value for valid AD users
commit 8994f3e15ed23f1a77cae955c983a32fa17ac18eed41e454#8250 from snipe/features/adds_addr_city_state_to_importer
Added address, city, state and country to importer and city to bulk editor
commit b09e7d19b32fa17ac185b905154373b1e46f72#8254 from Godmartinz/gmartinez_adds_email_formats
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…
commit 3b1e46f72b0c1a1de2a220c9ae5818eed41e4549b750f4754fc17a06792a4f76cc6cfbb905154373Fixed #8247 - added notes field to user details display
commit daf748e531799a93c46a34aa12e22981a633288897757bd0#8239 from snipe/fixes/api_rtd_to_location_on_create
Set location_id to rtd_location_id on asset creation
commit 897757bd04c7125c393781a63328896e563f6e4b5320f5c677f69ae953https://github.com/snipe/snipe-it
commit 5320f5c67c7f69ae953bc79f8c1ba17f6fbabf#8227 from snipe/fix_select2_ajax_pulldowns
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 17f6fbabfac79f8c1baf12c92e30b536401fe0#8207 from EDVLeer/patch-1
Update snipeit.sh
commit e7a820f7c912c92e30b7fd10b755b0dbbb7680d9cf0dd5bbad25e53d8c7fec6ed256f89d433b41#8216 from snipe/features/checkout_license_to_all_users
Added CLI tool to checkout license to all users
commit 89d433b41ae2570ada6f45afe725a1536401fe0fec6ed256fb2aaa7bed2d339bdddc3cc9f1577a#8183 from snipe/features/merge_users
Added merge utility
commit cc9f1577a4ab1fe8be0c339bdddc3835b9cf4b707ccb41371e2e60a457bf2390d2160bb42801f6a00b051b8c#8164 from snipe/features/additional_security_headers
Additional security headers
commit 00b051b8c705b3a9ad7e4fb880384f43042ad841a716382ac436c8f7f4f1b42801f6aede4934f21946129f20#8163 from snipe/fixes/fix-for-css-on-column-selector
Fixed weird padlock display in asset listing with encrypted custom fields
commit 946129f206b941ef1e08d1aa11ec89de4934f21daf06e4205b10076b01#8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
commit b10076b015af06e420569a2440dc4bbeae8efb22ac1c1636#8141 from snipe/fixes/better_handling_when_license_is_invalid
Better handle the logic to determine if we should display the license checkout blade [ch13792]
commit 2ac1c1636c004ecad059beae8efb21d14ab7e3e9839e5e56#8088 from Godmartinz/Label_Woes
Barcode resizing and text adjustment
commit 9839e5e566d14ab7e3e1#8053 to master
Signed-off-by: snipe <snipe@snipe.net>
commit e7f74d94c1e97cf011b6ed23505054001e721530f886837668210da6e8#8063 from dmeltzer/backport-8092
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
commit 8210da6e82f88683766be4385c0f8cFixes #8051 regression
Signed-off-by: snipe <snipe@snipe.net>
commit 0550fe0ffa7fb3a9b82c9a2ed804cecb1e87fe#8043 from snipe/features/backup-optional-in-import-and-ldap
Added option to disable backup in import
commit ecb1e87fe6f43df5f04195cc48e4229a2ed804cad20fad28e5ae813ddf75bb42109c0cf46ecf8ec0b9e821c0e69ee28c75131a8ba067020fd232e70ee4d69b1chttps://github.com/snipe/snipe-it
commit 0fd232e70dee4d69b1c531c535094d1ad11194#8041 from alek13/patch-1
use supported package for slack
commit d1ad111949https://github.com/maknz/slack/issues/94
commit 31c53509417eb70e17e05bb4f271a3dfcb4699#7993 from snipe/fixes/7989_column_selector
Fixed #7989 - Converted table heading icons in People to CSS glyphs
commit 3dfcb4699196eb96f964a2f08bd3bae009fbe59f5bb4f271aaFixed #7987 - allow toggle of required/optional in custom fields/fieldsets
Signed-off-by: snipe <snipe@snipe.net>
2020-08-31 12:17:19 -07:00
snipe
8cc9e61983
Ugh
...
Sorry, my local testing environment is fscked right now :(
Signed-off-by: snipe <snipe@snipe.net>
2020-05-12 20:38:32 -07:00
snipe
c5560e466e
Removed fieldset from test
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-12 20:17:35 -07:00
snipe
157a2ee869
Merge pull request #8048 from dmeltzer/license-importer-checkout-fix
...
License importer checkout fixes
2020-05-12 13:51:36 -07:00
snipe
de7ee40863
Fixed failing test
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-12 11:52:08 -07:00
Daniel Meltzer
e4888b23e2
Save User ID when checking out a license. Also buff up importing tests to confirm license can be checked out.
2020-05-12 14:38:20 -04:00
snipe
8507bcd16b
Merge pull request #8008 from dmeltzer/component-checkinout-fixes
...
Component checkout/checkin fixes.
2020-04-30 17:49:22 -07:00
Daniel Meltzer
b28a4f3108
Add component unit test and unify some validation.
2020-04-30 09:50:12 -04:00
Daniel Meltzer
1f8c3cc670
Test fixes.
2020-04-29 11:03:07 -04:00
Daniel Meltzer
3e7fbb02b7
Notes and style cleanups
2020-04-28 11:44:17 -04:00
Daniel Meltzer
9520ccae47
Unit test fix. Cleaner this way.
2020-04-28 11:39:53 -04:00
Daniel Meltzer
05187eb27f
Fix Functional Tests.
2020-04-28 11:39:53 -04:00
Daniel Meltzer
82de51f23e
Some unittest fixes for local running adapting to various factory changes.
2020-04-28 11:39:52 -04:00
snipe
c50b81ff19
Added resources
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:15:24 -07:00
snipe
82b6d2b31b
Fixed a few more tests
2020-04-21 21:13:00 -07:00
snipe
bbc2ac2f9d
Updated tests with new location.id!=location.parent_id rule
2020-04-21 19:51:42 -07:00
snipe
1c5486e588
Updated test method for newer codeception from assertContains to assertStringContainsString
2020-04-21 19:28:06 -07:00
snipe
aa4d0c4a6b
Ugh. NPM is the fucking worst.
2019-12-11 19:36:55 -08:00
snipe
5290c47e2a
Merge branch 'develop' into v5-master-develop-integration
...
# Conflicts:
# .env.example
# .travis.yml
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Console/Kernel.php
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Middleware/EncryptCookies.php
# app/Http/Requests/AssetRequest.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/AssetImporter.php
# app/Models/AssetMaintenance.php
# app/Models/Location.php
# app/Models/User.php
# composer.json
# composer.lock
# config/backup.php
# config/database.php
# config/version.php
# public/mix-manifest.json
# resources/lang/en-ID/general.php
# resources/lang/vi/admin/settings/general.php
# resources/views/accessories/edit.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# tests/api/ApiCategoriesCest.php
2019-11-18 19:49:39 -08:00
snipe
441ae69f5c
Integrations/develop into master ( #7352 )
...
* Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992 )
* Added upcoming audit report
TODO: Fid diff/threshold math
* Added route to list overdue / upcoming assets via API
* Controller/API methods for due/overdue audits
We could probably skip this and just handle it via view in the routes…
* Added query scopes for due and overdue audits
* Added audit due console command to kernel
* Added ability to pass audit specs to main API asset search method
* Added audit presenter
* Added bootstrap-tables presenter formatter to display an audit button
* Added gated sidenav items to left nav
* Added audit due/overdue blades
* Cleanup on audit due/overdue console command
* Added language strings for audit views
* Fixed :threshold placeholder
* Removed unused setting variable
* Fixed next audit date math
* Added scope for both overdue and upcoming
* Derp. Wrong version
* Bumped version
(I will release this version officially tomorrow)
* Leave the activated state for users alone in normal LDAP synchronisation. (#6988 )
* Fixed #7003 - crash when warranty months or purchase date is null
* Fixed #6956 - viewKeys policy inconsistent (#7009 )
* Fixed #6956 - Added additional gates show showing/hiding license keys
* Modified gate to allow user to see licenses if they can create or edit the license as well
* Added API middleware to API routes to enable throttling
TODO: Figure out how to make this costumizable without touching the code
* Import locations from CSV via command line (#7021 )
* Added import locations command
* Small fixes to location importer
* Added country, LDAP OU
* Cleaned up comments, added more clarification to what the script does
* Added ability to update groups via API
Fixes [ch9139]
* Bumped version
* Fixed #6883 - remove escaping of fields on LDAP import
* Fixed #6880 - correctly encrypt encrypted fields via the API
* Fixes #5054 : LDAP users deactivated for none-ad (#7032 )
When using none-AD ldap, users are automatically deactivated every LDAP
sync. This commit changes the behaviour so that if the active flag isn't set,
the users are enabled.
Fixed #5054 , at least for 4.X
* Updated packages
- Updating erusev/parsedown (v1.7.2 => 1.7.3): Downloading (100%)
- Updating squizlabs/php_codesniffer (3.4.1 => 3.4.2): Downloading (100%)
- Updating symfony/polyfill-mbstring (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/var-dumper (v3.4.23 => v3.4.27): Downloading (100%)
- Updating league/flysystem (1.0.50 => 1.0.51): Downloading (100%)
- Updating symfony/translation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating nesbot/carbon (1.36.2 => 1.37.1): Downloading (100%)
- Updating symfony/debug (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/console (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/finder (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-ctype (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php70 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/http-foundation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/event-dispatcher (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/http-kernel (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/process (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/routing (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-util (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php56 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/psr-http-message-bridge (v1.1.1 => v1.1.2): Downloading (failed)
Downloading (100%)
- Updating rollbar/rollbar (v1.7.5 => v1.8.1): Downloading (100%)
- Updating symfony/yaml (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/browser-kit (v3.4.23 => v3.4.27): Downloading (100%)
* Fixed #7044 - API update deleted custom fields if they are not re-presented
* Fixed XSS vulnerability when creating a new categories, etc via modal on create
Same fix as before, because of the weird select2 post-parsing ajax behavior
* Updated email strings
* Fixed #7046 - added user website url back into UI
* Updated language strings
* Bumped version
* Updated packages
* New backups config for spatie
* Removed debugbar service provider (autodiscovery)
* Use laravel v5.5 withCount manual aliases
* Added spatie language files
* Removed old laravel backups config
This config file was renamed in a newer version of spatie laravel-backup
* Set the serialization
* Added the command loader to console kernel
* Renamed fire() to handle()
* Updated withCount to use manual naming
* Updated backup path in backup admin
* Updated travis with new php versions
* Bumped laravel version in readme
* Fixed custom field edit screen
* Fixed baseUrl is undefined error
I literally cannot figure out how this ever worked before.
* Fix for included files in backup
* Bumped version
* Switch has() to filled()
* Change ->has() to ->filled()
* Removed cosole log
* Bumped packages
* Use getReader instead of fetchAssoc for CSV parser
https://csv.thephpleague.com/9.0/upgrading/
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Trying to fix ajax asset validation
This I think gets us closer, but still not handling the validation on the asset properly.
When I do a print_r of the validation in the other items, its looking for an error bag that looks something like this:
```
Illuminate\Support\MessageBag Object
(
[messages:protected] => Array
(
[name] => Array
(
[0] => The name field is required.
)
[seats] => Array
(
[0] => The seats field is required.
)
[category_id] => Array
(
[0] => The category id field is required.
)
)
[format:protected] => :message
)
```
Currently the Assets ajax returns:
```
[2019-05-24 06:52:06] develop.ERROR: array (
'messages' =>
array (
'model_id' =>
array (
0 => 'The model id field is required.',
),
'status_id' =>
array (
0 => 'The status id field is required.',
),
'asset_tag' =>
array (
0 => 'The asset tag field is required.',
),
),
)
```
So not sure why it’s not working.
* Fixed missing asset validation
* Check that a model exists before trying to fiddle with fieldsets
* Tidied up license check
* Removed extra escaping on checkin
* Updated importer to work with newer CSV Reader::getRecords() method
* Fixed field mapping
* Small fix for reordering fields
Fixes Illuminate\Database\QueryException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'order' cannot be null (SQL: insert into `custom_field_custom_fieldset` (`custom_field_id`, `custom_fieldset_id`, `order`, `required`) values (12, 7, , 0)) [ch1151]
This needs revisiting for a more solid fix, especially for data that was already entered bad.
* Fixed bug where sorting by company name in Users API did not work
Fixes [ch9200]
* Removed custom fields from AssignedSearch to prevent confusing data in selectlist
Fixes [ch9193]
* Removed alert-danger from tests
* Fixed missed consumables_count withCount() statement
* Fixed Undefined variable user in $backto if checked out to a non-user
Fixes [ch9194]
* Check for valid model before attempting to access fieldsets
Fixes [ch1249]
* Only build the log upload destination path if there is a matching record
Fixes [ch1232]
* Fixed free_seats_count variable name
(I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables)
* Only gtry to delete the file if a record is found in the log
* Only try to get fieldset if model is valid
* Fixed more camel-casing -> snake-casing
* Only display the file if the log record can be found
* Fixed casing in sync command
* Updated README
* Derp - typo
* Added link to Atlassian plugin
* More Atlassian clarifications
* Show accessory image on view page
* Increased image size to 800px, added lightboxes
* Fixed #7083 - Removed user_exists constraint on department save
If the user has been deleted, this prevented the department from being successfully saved on edit
* Updated branch in version file
* Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084 )
* bump up to php7.1
& change deprecated MAINTAINER to a LABEL so it is visible with `docker inspect`
* AND modapache ><
* 2 updates required to get software-properties+ppa
* Bumped version
* Bumped release again :(
* Missed one
* Fixed #7098 - updated backup config for deleteFile() method
* Fixed #7092 - handle weird port forwarding/port numbers for baseUrl
* Bumped version
* Fixed #7099 - set email to null by default for backup notifications
* Removed old comments
* Fixed #7100 - Check if $user isset on checkin
* Increased throttle to 120 requests per minute
* Added Filipino, corrected order for Spanish variations
* Update language strings
* Bumped hash
* Changed has to filled to fix bulk asset editing
* Bumped point version
* Small fixes for phpleague CSB reader v9
* Improved error checking in locations importer
* Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility
* Reduce minimum group name length to 2 (from 3)
eg: IT
* Back in time fix FOR #7145 for new installs on MySQL 8+
* Fixed permission insert
//TODO
Handle this via model
* Possible fix for reporting/admin migration back in time
* Fixed #7164 - change table name to permission_groups
* Fixed LDAP password blanking on save
* fixing previous commit's actual wiping of password (#7183 )
replaced Input::fille('ldap_pword') with _filled_. Should be good to go.
https://github.com/snipe/snipe-it/issues/7179
https://github.com/snipe/snipe-it/issues/7169
* Bumped version
* Downgrading rollbar for Laravel 5.5
* Spelling Correction (#7206 )
Fixed Spelling for the word reqrite, to be rewrite.
* Fix #6910 : Add logic to manipulate the eloquent query. (#7006 )
* Added company_id to consumables_users table
* Added logic to manage when a pivot table doesn't have the column company_id trough a join with users
* Remove a migration that tries to fix this problem, but is not longer necessary
* Addresses #7238 - add PWA code to layout
Needs additional UX testing
* Better log message for bad LDAP connection
* Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed
* Comment clarification on #7186
* Check for valid seat on hardware view
* Added space between footer and custom message
* Cap warranty months to three characters
Filles rollbar 209
* Cap warranty months to 3 on the frontend blade
* Fixed countable() strings on user destroy
* Check that the user has assets and that the aset model is valid
* Bumped hash
* Caps asset warranty to 20 years
* Command to fix custom field unicode conversion differences between PHP versions (#7263 )
* Fixes #7252 form request changes (#7272 )
* Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests
* Removed debug info
* More fixes for #7252
This is mostly working as intended, if not yet the way Laravel wants us to do it.
Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress.
* Removed experimental method
* Check for digits_between:0,240 for warranty
* Removed debug code
* Apply fix from PR #7273 to master
* Bumped hash
* Fixed #7250 - permission issue for API fieldsets and fields endpoints
This applies the change from #7294 to master
* Add @mskrip as a contributor
* Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name
* CORS for api (#7292 )
* Added CORS support to API
* Changed order so CORS will still work if throttle hit
* Added APP_CORS_ALLOWED_ORIGINS env option
* Fixed typo
* Clarified header comments
* More clarification
* DIsable CORS allowed origins by default to replicate existing behavior
* Change variable name to be clearer
* Bumped version
* Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7317 )
* Added comments to the ByFilter query scope for clarity
* Added accessories checkout/checkin API endpoint
* Fixed CVE-2019-10742
https://nvd.nist.gov/vuln/detail/CVE-2019-10742
* Update README.md (#7334 )
Add reference to CSV importer.
* Group related variables in .env
* History importer fixes
* Fixes to history importer
2019-08-14 21:48:14 -07:00
snipe
56576d9e45
Fixed more camel-casing -> snake-casing
2019-05-24 16:01:12 -07:00
snipe
d596ced0a0
Fixed free_seats_count variable name
...
(I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables)
2019-05-24 15:44:18 -07:00
snipe
0e48d7b080
Removed alert-danger from tests
2019-05-24 14:21:37 -07:00
snipe
20d0dce73e
Use laravel v5.5 withCount manual aliases
2019-05-22 00:50:48 -07:00
Martin Meredith
a462e91983
(develop): Fix failing Unit Tests ( #6807 )
...
* Reference correct class for Licence Model
* Make sure we activate users in test to send Welcome Notification
2019-03-13 10:57:43 -07:00
snipe
0000f487ac
Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop
...
# Conflicts:
# config/version.php
2019-02-13 23:02:21 -08:00
snipe
35ebe33e4e
Fixed #6703 - fixes password confirmation ( #6711 )
...
* Fixed #6703 - fixes password confirmation
* Removed debugging
* Fixed tests
* I guess we use 10 as the settings for password min in tests
* One more try to fix tests - confirmation won’t validate until password validates
2019-02-13 23:01:19 -08:00
snipe
c3c4ad1ae6
One more try to fix tests - confirmation won’t validate until password validates
2019-02-13 22:45:05 -08:00
snipe
a4420efb7d
I guess we use 10 as the settings for password min in tests
2019-02-13 22:13:32 -08:00
snipe
794bc45cc0
Fixed tests
2019-02-13 21:59:24 -08:00
