837 commits

Author	SHA1	Message	Date
Marcus Moore	7c2fae7b9d	Scaffold api test cases	2024-04-10 17:08:45 -07:00
Marcus Moore	70934e54cf	Remove unneeded comment	2024-04-10 16:34:14 -07:00
Marcus Moore	f6ad275030	Clean ups	2024-04-10 16:28:48 -07:00
Marcus Moore	6666a78936	Organization	2024-04-10 16:19:04 -07:00
Marcus Moore	bbb2cdcceb	Add note	2024-04-10 16:15:43 -07:00
Marcus Moore	b63962e90b	Add additional assertions	2024-04-10 16:01:15 -07:00
Marcus Moore	4434de6241	Add test case	2024-04-10 15:47:26 -07:00
Marcus Moore	6d572424ac	Add validation around dates	2024-04-10 14:02:25 -07:00
Marcus Moore	d371d14c1f	Implement test	2024-04-10 13:49:07 -07:00
Marcus Moore	72eda1e909	Improve naming	2024-04-10 13:29:31 -07:00
Marcus Moore	7dbf8a8a8e	Add tests for asset and location check out	2024-04-10 13:28:52 -07:00
Marcus Moore	37ebf1827f	Organization	2024-04-10 12:12:44 -07:00
Marcus Moore	e65252725a	Add simple test for LogListener	2024-04-10 11:52:59 -07:00
Marcus Moore	6f53f2ac64	Finish implementing test case	2024-04-10 11:43:50 -07:00
Marcus Moore	deaba46e1c	Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout	2024-04-10 11:01:35 -07:00
Marcus Moore	1aeaa0094a	Fix assigned to in labels	2024-04-09 13:52:54 -07:00
Brady Wetherington	65e21faa3e	Merge branch 'develop' into snipeit_v7_laravel10 ... Hopefully, last merge?	2024-04-02 20:34:04 +01:00
spencerrlongg	cec84b857b	fixed last audit date + test	2024-03-27 14:39:23 -05:00
Spencer Long	013463aafc	Merge branch 'develop' into bug/sc-24884	2024-03-27 12:45:45 -05:00
Marcus Moore	675717ff82	Add failing test	2024-03-25 13:46:22 -07:00
Marcus Moore	5f4c964309	Account for last_audit_date not being provided	2024-03-25 12:45:11 -07:00
Marcus Moore	66ba96d531	Set last_audit_date to valid format in StoreAssetRequest	2024-03-25 12:38:12 -07:00
spencerrlongg	60ca634eff	remove interactswithsettings	2024-03-21 12:04:53 -05:00
Marcus Moore	b368acf941	Implement test case	2024-03-20 17:46:09 -07:00
Marcus Moore	530291f81c	Implement some tests	2024-03-20 14:28:27 -07:00
Marcus Moore	393dc51167	Add assertions around the event dispatch	2024-03-20 13:44:26 -07:00
spencerrlongg	8cc1397ace	rm a couple unnecessary	2024-03-20 15:36:53 -05:00
Marcus Moore	984cc7a4f2	Scaffold tests around asset checkout via web	2024-03-20 13:29:25 -07:00
spencerrlongg	e3e01e07b1	final cleanup	2024-03-20 15:23:45 -05:00
spencerrlongg	d18aa1db98	some more cleanup + tests	2024-03-20 15:18:15 -05:00
spencerrlongg	c155e4a7c9	new test for not found assets	2024-03-20 13:52:22 -05:00
spencerrlongg	fdf0be09db	all tests passing	2024-03-20 13:43:01 -05:00
Spencer Long	b4b4927370	Merge branch 'develop' into bug/sc-24884	2024-03-20 12:36:39 -05:00
spencerrlongg	0ffceb9691	some notes and a little progress	2024-03-20 00:07:52 -05:00
spencerrlongg	1e810d2426	most tests now passing, still one broken	2024-03-19 19:47:26 -05:00
spencerrlongg	c0110e7f29	some more tests and refinement	2024-03-19 19:27:35 -05:00
spencerrlongg	86ab880c90	buncha progress	2024-03-19 15:34:59 -05:00
Marcus Moore	d1dffb84dc	Remove InteractsWithSettings trait for remaining tests	2024-03-18 12:33:45 -07:00
Marcus Moore	541350916d	Merge branch 'develop' into chore/sc-25071 ... # Conflicts: # tests/Feature/Api/Users/UpdateUserApiTest.php # tests/Feature/Notifications/AccessoryWebhookTest.php # tests/Feature/Notifications/AssetWebhookTest.php # tests/Feature/Notifications/ComponentWebhookTest.php # tests/Feature/Notifications/ConsumableWebhookTest.php # tests/Feature/Notifications/LicenseWebhookTest.php	2024-03-18 12:33:31 -07:00
snipe	09d69b214b	Merge pull request #14436 from marcusmoore/chore/sc-24901 ... Organized notification test cases	2024-03-18 12:20:23 +00:00
Marcus Moore	a28bee86ba	Extract method	2024-03-14 16:33:49 -07:00
Marcus Moore	fb64892971	Re-order	2024-03-14 16:26:27 -07:00
Marcus Moore	95ff692b14	Improve InteractsWithSettings name	2024-03-14 15:06:52 -07:00
Marcus Moore	8003615b1f	Move InteractsWithSettings to TestCase	2024-03-14 14:15:11 -07:00
Marcus Moore	948dc3c974	Remove duplicate trait	2024-03-14 13:11:53 -07:00
Marcus Moore	1afb724606	Remove commented (and old) test cases	2024-03-14 13:11:43 -07:00
Marcus Moore	451281d833	Delete test cases with only commented code	2024-03-14 13:11:27 -07:00
Marcus Moore	485f11c945	Move trait usage to parent TestCase	2024-03-14 12:56:49 -07:00
Marcus Moore	dbc79655b0	Cleanup	2024-03-14 12:02:56 -07:00
Marcus Moore	02f6aa6161	Add group tag for new test case	2024-03-14 11:19:36 -07:00
Marcus Moore	07c5264b41	Organize email check in notifications test	2024-03-14 11:17:47 -07:00
Marcus Moore	7c178a6a78	Merge branch 'develop' into chore/sc-24901 ... # Conflicts: # tests/Feature/Notifications/AssetWebhookTest.php	2024-03-14 11:13:14 -07:00
Marcus Moore	8aed26aab1	Remove unneeded test cases	2024-03-13 16:56:54 -07:00
Marcus Moore	01d5d4c2c8	Improve data provider name	2024-03-13 16:37:50 -07:00
spencerrlongg	04d7884af8	some more testing stuff	2024-03-12 23:17:40 -05:00
spencerrlongg	6732b6601e	some cool progress, but something with unique not working	2024-03-12 18:33:59 -05:00
Brady Wetherington	5b9120ba6c	Merge branch 'develop' into snipeit_v7_laravel10	2024-03-05 19:22:37 +00:00
snipe	9dbb4abe7e	Fixed tests ... Signed-off-by: snipe <snipe@snipe.net>	2024-03-01 12:30:05 +00:00
Marcus Moore	551354b1bb	Add group annotation for tests	2024-02-27 18:05:18 -08:00
Marcus Moore	03b7891edc	Remove unneeded factory states	2024-02-27 18:03:53 -08:00
Marcus Moore	8978dff054	Consolidate helpers into trait	2024-02-27 18:01:08 -08:00
Marcus Moore	d20844fefa	Improve readability by extracting additional helpers	2024-02-27 17:57:12 -08:00
Marcus Moore	cd579a04dd	Improve readability by extracting fireCheckOutEvent method	2024-02-27 17:52:18 -08:00
Marcus Moore	15b8140bff	Fix test helper	2024-02-27 17:48:17 -08:00
Marcus Moore	9a93ad2e06	Remove unneeded factory state	2024-02-27 17:46:27 -08:00
Marcus Moore	bd4d3aa52b	Improve readability by extracting additional helpers	2024-02-27 17:44:19 -08:00
Marcus Moore	bf32ab177f	Improve readability by extracting fireCheckInEvent method	2024-02-27 17:37:07 -08:00
Marcus Moore	2ea883aa15	Move Notification::fake() to setUp method	2024-02-27 17:23:30 -08:00
Marcus Moore	43cc296582	Consolidate additional tests	2024-02-27 17:14:35 -08:00
Marcus Moore	4c1aadd74e	Improve naming and inline helper	2024-02-27 17:09:22 -08:00
Marcus Moore	7d3719bf70	Consolidate some slack notification tests	2024-02-27 17:07:40 -08:00
Marcus Moore	c08164d864	Update test names	2024-02-27 16:48:17 -08:00
Marcus Moore	b156aa74a5	Update helper name	2024-02-27 16:45:49 -08:00
Marcus Moore	5084e5d3ef	Improve variable type	2024-02-27 12:23:26 -08:00
Marcus Moore	69022bb8b6	Implement test	2024-02-27 11:12:35 -08:00
Marcus Moore	29d729171c	Align test with actual values passed from the web	2024-02-26 11:13:39 -08:00
Marcus Moore	c401c88702	Scope event fake	2024-02-22 16:19:33 -08:00
Marcus Moore	b55a19cebb	Add assertion event is dispatched with correct timestamp	2024-02-22 13:50:46 -08:00
Marcus Moore	4caadcfa19	Clear pending checkout acceptances when checking in asset via api	2024-02-22 13:33:16 -08:00
Marcus Moore	714fc63050	Have legacy locations updated upon api asset checkin	2024-02-22 13:14:30 -08:00
Marcus Moore	2df026bcb5	Allow updating asset default location when checking in asset via api	2024-02-22 12:40:14 -08:00
Marcus Moore	3ae8adfbf9	Remove incomplete flag on test case	2024-02-21 12:33:32 -08:00
Marcus Moore	aa2632fe46	Merge branch 'develop' into chore/sc-24808	2024-02-21 12:33:06 -08:00
Brady Wetherington	8f2843bfcf	Merge branch 'develop' into snipeit_v7_laravel10 ... Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.	2024-02-21 20:22:28 +00:00
Marcus Moore	bc0a7542ac	Change enableWebhook to enableSlackWebhook	2024-02-14 18:17:34 -08:00
Marcus Moore	aec59f2da6	Update assertion to be more correct	2024-02-14 12:27:42 -08:00
Marcus Moore	905df5ec25	Consolidate test cases	2024-02-14 12:14:27 -08:00
Marcus Moore	bacfdc5049	Scaffold additional tests	2024-02-14 11:33:03 -08:00
Marcus Moore	3cc72021b6	Move notification test to notifications test suite	2024-02-14 11:16:31 -08:00
Marcus Moore	4354e126b1	Scaffold tests	2024-02-14 11:11:08 -08:00
Marcus Moore	02f39472f9	Remove duplicate test	2024-02-14 11:10:59 -08:00
Marcus Moore	af513946a2	Implement test	2024-02-14 10:48:49 -08:00
Marcus Moore	ad1846fed6	Implement tests	2024-02-13 17:50:26 -08:00
Marcus Moore	9ab56fe9ca	Implement tests	2024-02-13 17:04:53 -08:00
Marcus Moore	f708b8b299	Implement test	2024-02-13 14:30:26 -08:00
Marcus Moore	391b832613	Implement test	2024-02-13 13:34:55 -08:00
Marcus Moore	b653d19579	Implement test	2024-02-13 13:29:54 -08:00
Marcus Moore	31a75bd252	Add some assertions	2024-02-13 13:17:02 -08:00
Marcus Moore	0506f3bef9	Scaffold additional tests	2024-02-13 12:35:31 -08:00
Marcus Moore	852b0b3f11	Scaffold additional tests	2024-02-13 12:15:59 -08:00
Marcus Moore	307b39bd38	Implement tests around asset check in	2024-02-13 12:03:27 -08:00
snipe	60ba898167	Merge pull request #14255 from marcusmoore/chore/sc-24805 ... Added LDAP group tag to LDAP tests	2024-02-13 13:42:51 +00:00
Marcus Moore	c81bc1d2ee	Scaffold tests around asset check in	2024-02-12 17:54:22 -08:00
Marcus Moore	7154d23759	Pass the correct variable to the route helper	2024-02-12 16:45:18 -08:00
Marcus Moore	df23fd0dee	Remove usused import	2024-02-12 16:35:54 -08:00
Marcus Moore	adfb8895df	Improve factory state name	2024-02-12 16:31:32 -08:00
Marcus Moore	728aaaab20	Ensure accessory check in emails are not sent when the setting is disabled	2024-02-12 16:22:59 -08:00
Marcus Moore	095a7d9b34	Scaffold tests around accessory check in	2024-02-12 12:54:48 -08:00
Marcus Moore	cf53f2778f	Add LDAP test cases to group	2024-02-12 12:28:27 -08:00
Marcus Moore	76cc5995d9	Write tests around getIdForCurrentUser method [sc-24748]	2024-02-05 12:38:33 -08:00
Marcus Moore	2e0e39ccc8	Ensure notification is sent when consumable is checked out via api	2024-01-30 13:19:20 -08:00
Marcus Moore	13c37e708f	Implement tests around consumable checkout	2024-01-30 12:43:20 -08:00
Marcus Moore	3f76d65b95	Improve test method name	2024-01-30 12:43:07 -08:00
Marcus Moore	6d41c8cf67	Merge branch 'develop' into bug/sc-24685	2024-01-30 11:44:36 -08:00
Marcus Moore	de2aa903c5	Scaffold tests	2024-01-29 17:56:55 -08:00
Marcus Moore	a2cba67f4e	Improve assertion	2024-01-29 16:59:57 -08:00
Marcus Moore	f1ab8253f0	Implement tests included two currently failing tests	2024-01-29 16:48:40 -08:00
Marcus Moore	e5d3df7d24	Scaffold accessory checkout tests for api	2024-01-29 15:59:23 -08:00
Marcus Moore	987676df08	Implement additional tests	2024-01-29 15:56:18 -08:00
Marcus Moore	f16f62f76c	Scaffold and implement some tests around accessory checkout	2024-01-29 14:21:30 -08:00
Brady Wetherington	8a2f3405d5	Merge branch 'develop' into snipeit_v7_laravel10 ... A lot of changes here, but hopefully this works?	2024-01-29 22:12:58 +00:00
snipe	d6c61e1429	Removed attribute assigning blank EOL as 0 ... Signed-off-by: snipe <snipe@snipe.net>	2024-01-25 21:34:20 +00:00
Marcus Moore	423b636db9	Guard against non-integers being passed for company_id	2024-01-09 10:57:43 -08:00
Brady Wetherington	f734e196e5	Merge branch 'develop' into snipeit_v7_laravel10	2024-01-08 18:57:55 +00:00
spencerrlongg	9e84521098	fix auto-increment settings for test settings	2024-01-02 18:10:59 -06:00
Spencer Long	8546407083	Merge branch 'develop' into refactor/store_asset_form_request	2024-01-02 18:05:15 -06:00
spencerrlongg	e028145ad9	Add new asset tests for archive, depreciate, and physical fields	2023-12-13 09:16:08 -06:00
snipe	f9697887e8	Removed extraneous test ... Signed-off-by: snipe <snipe@snipe.net>	2023-12-12 13:41:35 +00:00
snipe	0089ea2321	Merge pull request #13882 from marcusmoore/fixes/jquery-validation ... Fix client side validation in the v7 branch	2023-12-05 17:26:48 +00:00
spencerrlongg	cef1c5d4d2	cleanup test	2023-12-04 12:47:46 -06:00
spencerrlongg	ca8765e1d7	cleaned up	2023-11-30 16:18:50 -06:00
spencerrlongg	6e5f296a13	gets rid of depreciate	2023-11-30 16:08:49 -06:00
spencerrlongg	68d85385a2	get rid of physical	2023-11-30 16:03:30 -06:00
spencerrlongg	88b6a541ee	removed references to archived	2023-11-30 15:59:03 -06:00
spencerrlongg	135b7bde7d	added some more check out assertions	2023-11-30 11:53:26 -06:00
Brady Wetherington	5a60df55d1	Add more LDAP tests - including pagination(!)	2023-11-30 16:09:37 +00:00
Brady Wetherington	16da994e28	Add LDAP as 'recommended' requirement; flesh out LDAP tests	2023-11-30 14:00:20 +00:00
spencerrlongg	151ceb5fbe	get rid of firsts and find by responses id	2023-11-29 17:14:46 -06:00
spencerrlongg	c3492f1699	fixed eol, add calculated eol/eol explicit tests	2023-11-29 14:57:31 -06:00
spencerrlongg	9d8433bd6d	a couple quick things	2023-11-29 13:15:41 -06:00
spencerrlongg	65ca24f6ae	asset assigned to asset works now	2023-11-29 11:37:52 -06:00
spencerrlongg	b17078fffd	a couple notes	2023-11-28 22:15:13 -06:00
spencerrlongg	c886fb555b	checkout on store tests almost done	2023-11-28 22:11:20 -06:00
spencerrlongg	15d11f7f4e	test checkout to user on store	2023-11-28 21:46:03 -06:00
spencerrlongg	cba5f869c0	standardize some of the validation rules, fix int/string issue	2023-11-28 21:19:19 -06:00
spencerrlongg	5b77e66d28	get rid of deleted_at as it doesn't do anything	2023-11-28 17:16:17 -06:00
spencerrlongg	75ac7f80b9	some refactor + tests	2023-11-28 15:17:46 -06:00
Brady Wetherington	8e8b1068ff	Beginnings of LDAP test suite	2023-11-27 14:50:43 +00:00
Marcus Moore	714fce7e59	Add site name validation test	2023-11-14 12:23:58 -08:00
snipe	000a28d648	Merge pull request #13830 from spencerrlongg/bug/sc-23921 ... Resolves Exceptions When An Array is Submitted and Exception Occurs Before Validation	2023-11-13 20:19:44 +00:00
snipe	9e1cfac995	Merge pull request #13857 from akemidx/bug/sc-20532 ... Bug Fix: Undefined array key 266	2023-11-09 09:39:04 +00:00
Marcus Moore	49136a4d67	Add tests for color helper	2023-11-08 12:35:42 -08:00
akemidx	4382adce85	typo in error log message	2023-11-08 15:29:29 -05:00
akemidx	495521b70e	adjusting for less than 0 possibility	2023-11-08 12:51:51 -05:00
Marcus Moore	4fb349e326	Remove extra assertions	2023-11-06 14:04:52 -08:00
Marcus Moore	4d2790c3f4	Add tests for license checkout notes	2023-11-06 13:54:36 -08:00
spencerrlongg	75532d9662	adds permission test	2023-11-01 16:49:59 -05:00
Marcus Moore	417f9c21e4	Fix the storing of group permissions when creating via API	2023-10-10 17:51:29 -07:00
snipe	d916e20c10	Merge pull request #13415 from marcusmoore/feature/department-scoping ... Added `CompanyableTrait` to `Department` model	2023-09-14 12:52:53 +01:00
Marcus Moore	093bf57448	Update assertion and add failure messages	2023-09-07 16:42:49 -07:00
snipe	06836663c8	Merge pull request #13575 from marcusmoore/fixes/improve-api-messaging ... Added validation around department_id in API patch request	2023-09-07 21:36:20 +01:00
Marcus Moore	c6c1c64c1e	Remove todo	2023-09-07 13:30:05 -07:00
Marcus Moore	a7a70f6981	Test permissions update	2023-09-07 13:21:27 -07:00
Marcus Moore	39ff575ac1	Remove unused test cases	2023-09-07 13:16:08 -07:00
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 e321aeabae Merge: 8ec99ff43 37568ae9e Author: snipe <snipe@snipe.net> Date: Mon Aug 31 12:14:44 2020 -0700 Merge branch 'master' into integrations/2020-08-31-v5-rc # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/UsersController.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/Loggable.php # composer.json # composer.lock # config/version.php # public/css/build/all.css # public/css/dist/all.css # public/css/skins/skin-contrast.css # public/css/skins/skin-contrast.css.map # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/assets/less/overrides.less # resources/macros/macros.php # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/labels.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # resources/views/modals/model.blade.php # resources/views/modals/user.blade.php # resources/views/users/index.blade.php # routes/api.php # routes/web/fields.php # tests/unit/UserTest.php commit 37568ae9ec Merge: 01a832169 32ad9050c Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:49:37 2020 -0700 Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP Fixed #8338 - Added google maps to CSP commit 32ad9050cf Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:48:53 2020 -0700 Added google maps to CSP commit 01a832169c Merge: bcad49ce7 3c6883489 Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:38:31 2020 -0700 Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist Fixed #8335 - added assignedTo scope on status labels API call for assetlist commit 3c6883489c Author: snipe <snipe@snipe.net> Date: Tue Aug 25 20:37:30 2020 -0700 Added assignedTo scope commit bcad49ce79 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:10:22 2020 -0700 Try to better handle slack “too many requests” issue commit b5acca89d7 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 16:02:15 2020 -0700 Check for admin for slack notifications commit e52919cf1b Merge: 714576be4 29f3a5c48 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:35:15 2020 -0700 Merge pull request #8327 from snipe/features/checkin_license_from_all_users Checkin license from all users cli tool commit 29f3a5c48f Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:27:40 2020 -0700 Use more verbose annotation for Auth::user if/else commit 134e8e6fb9 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 15:25:07 2020 -0700 Moved user email nulling until after the save commit 714576be45 Merge: b999c50a2 512899294 Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Aug 14 15:24:03 2020 -0700 Merge pull request #8328 from snipe/fix_deprecation_report Fix deprecation report for customers with many active assets commit 5128992940 Author: Brady Wetherington <uberbrady@gmail.com> Date: Fri Aug 14 15:03:03 2020 -0700 Fix deprecation report for customers with many active assets commit 0291323502 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:57:58 2020 -0700 Use the user as the target commit e0f6f9b839 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:37 2020 -0700 Artisan command to check in licenses from all users commit f1a6308002 Author: snipe <snipe@snipe.net> Date: Fri Aug 14 14:43:07 2020 -0700 Check for Auth::user before trying to log id (for cli) commit b999c50a2e Merge: 9ca20e496 e3906b245 Author: snipe <snipe@snipe.net> Date: Wed Aug 12 12:37:47 2020 -0700 Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation Looks great, thank you! commit e3906b245c Author: Godfrey M <godmartinz@gmail.com> Date: Wed Aug 12 12:27:18 2020 -0700 added translation for admin/licenses/message.not_found commit 9ca20e4964 Merge: e0644dbbf 456a74d88 Author: Brady Wetherington <bwetherington@grokability.com> Date: Tue Aug 11 17:33:19 2020 -0700 Merge pull request #8313 from snipe/improve_ldap_search_error_reporting Improve ldap search error reporting commit 456a74d88c Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:41:20 2020 -0700 De-merge out incorrectly merged files. Whoops! commit 799c059070 Author: Brady Wetherington <uberbrady@gmail.com> Date: Tue Aug 11 16:21:18 2020 -0700 Add internationalized version of LDAP error message commit c62d43a778 Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:04:17 2020 -0700 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better commit b725bd0fae Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Aug 10 17:23:04 2020 -0700 Add @PeterUpfold as a contributor commit e0644dbbf6 Merge: 5b6925b00 004ecad05 Author: Brady Wetherington <bwetherington@grokability.com> Date: Mon Aug 10 17:22:31 2020 -0700 Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result() commit 5b6925b00c Author: snipe <snipe@snipe.net> Date: Tue Aug 4 21:00:37 2020 -0700 Removed debugging :( commit df17a859bf Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:59:54 2020 -0700 Changed modal IDs so manager creation modal works on user creation main page commit 24c43056ba Author: snipe <snipe@snipe.net> Date: Tue Aug 4 20:58:28 2020 -0700 Moved pGenerator script to default layout footer This fixes an issue where the password generator wouldn’t load in a modal in Chrome commit 606b7e905d Author: snipe <snipe@snipe.net> Date: Fri Jul 31 17:02:33 2020 -0700 Small edits to PR template Slight text changes to ask specifics about versions commit d73ddad477 Author: snipe <snipe@snipe.net> Date: Fri Jul 31 16:59:26 2020 -0700 Created a PR template First draft of the PR guidelines template commit 9a39cf721e Merge: 7410b1683 8994f3e15 Author: snipe <snipe@snipe.net> Date: Fri Jul 31 12:18:49 2020 -0700 Merge pull request #8258 from ballertv/features/consumable-api This looks great, thank you! commit 7410b16835 Merge: e955c983a b09e7d19b Author: Brady Wetherington <bwetherington@grokability.com> Date: Fri Jul 24 16:22:44 2020 -0700 Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 Add new useraccountcontrol value for valid AD users commit 8994f3e15e Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 19:57:06 2020 -0400 cleanup commit d23f1a77ca Author: andres <andresgutierrez535@gmail.com> Date: Wed Jul 22 18:46:02 2020 -0400 implement checkout API commit e955c983a3 Merge: 2fa17ac18 eed41e454 Author: snipe <snipe@snipe.net> Date: Wed Jul 22 13:43:29 2020 -0700 Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer Added address, city, state and country to importer and city to bulk editor commit b09e7d19b3 Author: Brady Wetherington <uberbrady@gmail.com> Date: Wed Jul 22 13:32:16 2020 -0700 Add new useraccountcontrol value for valid AD users; document algorithm and values commit 2fa17ac185 Merge: b90515437 3b1e46f72 Author: snipe <snipe@snipe.net> Date: Wed Jul 22 12:06:31 2020 -0700 Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats Added firstinitial.lastname, lastname_firstinitial, firstnamelastname… commit 3b1e46f72b Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:25:57 2020 -0700 Update general.php commit 0c1a1de2a2 Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com> Date: Wed Jul 22 11:24:36 2020 -0700 Update general.php fixed typo commit 20c9ae5818 Author: Godfrey M <godmartinz@gmail.com> Date: Wed Jul 22 10:21:19 2020 -0700 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats commit eed41e4549 Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:57:32 2020 -0700 Moved address down further, fixed broken HTML commit b750f4754f Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:54 2020 -0700 Added city to bulk user importer commit c17a06792a Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:49:38 2020 -0700 Added address, city, state, country to user importer commit 4f76cc6cfb Author: snipe <snipe@snipe.net> Date: Tue Jul 21 16:46:13 2020 -0700 I don’t actually know what this file is for commit b905154373 Author: snipe <snipe@snipe.net> Date: Mon Jul 20 14:29:32 2020 -0700 Fixed #8247 - added notes field to user details display commit daf748e531 Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:32:01 2020 -0700 Bumped hash commit 799a93c46a Author: snipe <snipe@snipe.net> Date: Fri Jul 17 12:11:32 2020 -0700 Allow for email/username search on users commit 34aa12e229 Merge: 81a633288 897757bd0 Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:44:13 2020 -0700 Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create Set location_id to rtd_location_id on asset creation commit 897757bd04 Author: snipe <snipe@snipe.net> Date: Thu Jul 16 17:43:44 2020 -0700 Removed added line for location commit c7125c3937 Author: snipe <snipe@snipe.net> Date: Thu Jul 16 16:34:39 2020 -0700 Set location_id to rtd_location_id on asset creation commit 81a6332889 Author: snipe <snipe@snipe.net> Date: Tue Jul 14 13:55:38 2020 -0700 Removed license ID from seats table cookie info This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses commit 6e563f6e4b Merge: 5320f5c67 7f69ae953 Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:54 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit 5320f5c67c Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:45 2020 -0700 Disallow non-super users from editing their own permissions commit 7f69ae953b Merge: c79f8c1ba 17f6fbabf Author: snipe <snipe@snipe.net> Date: Mon Jul 13 21:16:00 2020 -0700 Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit 17f6fbabfa Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 21:12:03 2020 -0700 Switch to 'items' to maintain compatbility with other internal API's commit c79f8c1baf Merge: 12c92e30b 536401fe0 Author: snipe <snipe@snipe.net> Date: Mon Jul 13 17:42:16 2020 -0700 Merge pull request #8207 from EDVLeer/patch-1 Update snipeit.sh commit e7a820f7c9 Author: Brady Wetherington <uberbrady@gmail.com> Date: Mon Jul 13 17:14:31 2020 -0700 Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit 12c92e30b7 Author: snipe <snipe@snipe.net> Date: Fri Jul 10 16:21:27 2020 -0700 Show whether or not the user was imported via LDAP in the view page commit fd10b755b0 Author: snipe <snipe@snipe.net> Date: Fri Jul 10 11:30:01 2020 -0700 Removed the sr-only tag in table headers It was breaking Bootstrap Tables column selector :( commit dbbb7680d9 Author: snipe <snipe@snipe.net> Date: Thu Jul 9 21:12:50 2020 -0700 A few more fixes for the cli Do not check out a piece of software if it’s already been checked out to the user commit cf0dd5bbad Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:43:13 2020 -0700 Small fixes for cli tool commit 25e53d8c7f Merge: ec6ed256f 89d433b41 Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:27:01 2020 -0700 Merge pull request #8216 from snipe/features/checkout_license_to_all_users Added CLI tool to checkout license to all users commit 89d433b41a Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:26:02 2020 -0700 Removed duplicate seat call commit e2570ada6f Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:04:05 2020 -0700 CLI tool to checkout a license to ALL users commit 45afe725a1 Author: snipe <snipe@snipe.net> Date: Thu Jul 9 20:03:47 2020 -0700 Only try to get the company if there is an auth’d user (Needed for command line tools, where no Auth::user() is present) commit 536401fe0f Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com> Date: Tue Jul 7 08:21:36 2020 +0200 Update snipeit.sh Ubuntu 20.04 commit ec6ed256fb Author: snipe <snipe@snipe.net> Date: Mon Jul 6 18:45:43 2020 -0700 Bumped minor version commit 2aaa7bed2d Merge: 339bdddc3 cc9f1577a Author: snipe <snipe@snipe.net> Date: Thu Jun 25 18:37:41 2020 -0700 Merge pull request #8183 from snipe/features/merge_users Added merge utility commit cc9f1577a4 Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:43:53 2020 -0700 Removed unused use directives commit ab1fe8be0c Author: snipe <snipe@snipe.net> Date: Thu Jun 25 17:42:39 2020 -0700 Added merge utility commit 339bdddc38 Author: snipe <snipe@snipe.net> Date: Thu Jun 25 11:00:33 2020 -0700 Fix for Vue js not loading due to CSP :( commit 35b9cf4b70 Author: snipe <snipe@snipe.net> Date: Tue Jun 23 02:41:59 2020 -0700 Fixed missing db prefix on scopeDueOrOverdueForAudit commit 7ccb41371e Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:09:39 2020 -0700 Removed unoptimized images directive securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯ commit 2e60a457bf Author: snipe <snipe@snipe.net> Date: Tue Jun 23 01:07:00 2020 -0700 Dumb fix for feature-policy being dumb. commit 2390d2160b Merge: b42801f6a 00b051b8c Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:27:47 2020 -0700 Merge pull request #8164 from snipe/features/additional_security_headers Additional security headers commit 00b051b8c7 Author: snipe <snipe@snipe.net> Date: Tue Jun 23 00:26:09 2020 -0700 Added a few more comments commit 05b3a9ad7e Author: snipe <snipe@snipe.net> Date: Mon Jun 22 23:17:27 2020 -0700 Config variable for HSTS commit 4fb880384f Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:37:14 2020 -0700 Changed comment commit 43042ad841 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:35:59 2020 -0700 Consolidated ReferrerPolicy into new SecurityHeaders file commit a716382ac4 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:33:37 2020 -0700 Removed CSP middleware (it’s added in the general header) commit 36c8f7f4f1 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 22:31:01 2020 -0700 Additional security headers commit b42801f6ae Merge: de4934f21 946129f20 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:47:35 2020 -0700 Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector Fixed weird padlock display in asset listing with encrypted custom fields commit 946129f206 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:45:20 2020 -0700 Made quote style consistent commit b941ef1e08 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:41:40 2020 -0700 Pulled CSS font awesome styles out of the blade and into overrides.css commit d1aa11ec89 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 20:29:19 2020 -0700 Fix for weird padlock display in asset listing with encrypted custom fields commit de4934f21d Merge: af06e4205 b10076b01 Author: snipe <snipe@snipe.net> Date: Mon Jun 22 17:28:38 2020 -0700 Merge pull request #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 b10076b015 Author: Godfrey M <godmartinz@gmail.com> Date: Mon Jun 22 17:04:39 2020 -0700 corrected an error where font-size for labels were static in settings. commit af06e42056 Author: snipe <snipe@snipe.net> Date: Wed Jun 17 11:17:25 2020 -0700 Bumped version commit 9a2440dc4b Merge: beae8efb2 2ac1c1636 Author: snipe <snipe@snipe.net> Date: Tue Jun 16 20:20:07 2020 -0700 Merge pull request #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 2ac1c1636c Author: snipe <snipe@snipe.net> Date: Tue Jun 16 16:12:57 2020 -0700 Better handle the logic to determine if we should display the license checkout blade commit 004ecad059 Author: Peter Upfold <pgithub@upfold.org.uk> Date: Wed Jun 3 08:59:50 2020 +0100 Force suppress deprecation warning on ldap_control_paged_result() commit beae8efb21 Merge: d14ab7e3e 9839e5e56 Author: snipe <snipe@snipe.net> Date: Wed May 27 23:01:33 2020 -0700 Merge pull request #8088 from Godmartinz/Label_Woes Barcode resizing and text adjustment commit 9839e5e566 Author: Godfrey M <godmartinz@gmail.com> Date: Wed May 27 12:27:40 2020 -0700 adjusted for all label text, removed local variable commit d14ab7e3e1 Author: snipe <snipe@snipe.net> Date: Wed May 27 00:22:44 2020 -0700 Porting change from #8053 to master Signed-off-by: snipe <snipe@snipe.net> commit e7f74d94c1 Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:22:45 2020 -0700 Label_Woes commit e97cf011b6 Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:15:39 2020 -0700 Label_Woes commit ed23505054 Author: Godfrey M <godmartinz@gmail.com> Date: Tue May 26 17:10:45 2020 -0700 Label_Woes commit 001e721530 Merge: f88683766 8210da6e8 Author: snipe <snipe@snipe.net> Date: Wed May 20 10:21:52 2020 -0700 Merge pull request #8063 from dmeltzer/backport-8092 BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635] commit 8210da6e82 Author: Daniel Meltzer <dmeltzer.devel@gmail.com> Date: Wed May 20 10:29:27 2020 -0400 Fix Missing Category selection in Asset Model Modal dialog. A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information. commit f88683766b Author: snipe <snipe@snipe.net> Date: Thu May 14 00:55:47 2020 -0700 Roll back previous change Signed-off-by: snipe <snipe@snipe.net> commit e4385c0f8c Author: snipe <snipe@snipe.net> Date: Thu May 14 00:48:30 2020 -0700 Fixes #8051 regression Signed-off-by: snipe <snipe@snipe.net> commit 0550fe0ffa Author: snipe <snipe@snipe.net> Date: Tue May 12 10:31:54 2020 -0700 Fix for session fixation vulnerability Signed-off-by: snipe <snipe@snipe.net> commit 7fb3a9b82c Merge: 9a2ed804c ecb1e87fe Author: snipe <snipe@snipe.net> Date: Mon May 11 22:41:36 2020 -0700 Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap Added option to disable backup in import commit ecb1e87fe6 Author: snipe <snipe@snipe.net> Date: Mon May 11 20:45:15 2020 -0700 Updated assets Signed-off-by: snipe <snipe@snipe.net> commit f43df5f041 Author: snipe <snipe@snipe.net> Date: Mon May 11 20:44:46 2020 -0700 Fixed form label Signed-off-by: snipe <snipe@snipe.net> commit 95cc48e422 Author: snipe <snipe@snipe.net> Date: Mon May 11 20:41:10 2020 -0700 Added option to disable backup in import Signed-off-by: snipe <snipe@snipe.net> commit 9a2ed804ca Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:42 2020 -0700 Fixed mismatched HTML header tags Signed-off-by: snipe <snipe@snipe.net> commit d20fad28e5 Author: snipe <snipe@snipe.net> Date: Mon May 11 20:28:24 2020 -0700 Use more modern request helper Signed-off-by: snipe <snipe@snipe.net> commit ae813ddf75 Author: snipe <snipe@snipe.net> Date: Mon May 11 18:11:16 2020 -0700 Add @alek13 as a contributor commit bb42109c0c Author: snipe <snipe@snipe.net> Date: Mon May 11 18:10:45 2020 -0700 Added a clarifying comment Signed-off-by: snipe <snipe@snipe.net> commit f46ecf8ec0 Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:20 2020 -0700 Updated composer lock Signed-off-by: snipe <snipe@snipe.net> commit b9e821c0e6 Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:14 2020 -0700 Small fix for Group Functional Tests Signed-off-by: snipe <snipe@snipe.net> commit 9ee28c7513 Author: snipe <snipe@snipe.net> Date: Mon May 11 18:07:02 2020 -0700 Switched to use info instead of danger on undeployable statuses Signed-off-by: snipe <snipe@snipe.net> commit 1a8ba06702 Merge: 0fd232e70 ee4d69b1c Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:32 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit 0fd232e70d Author: snipe <snipe@snipe.net> Date: Mon May 11 17:53:24 2020 -0700 Fixed group functional test (We had changed the minimum to 2 instead of 3) Signed-off-by: snipe <snipe@snipe.net> commit ee4d69b1c5 Merge: 31c535094 d1ad11194 Author: snipe <snipe@snipe.net> Date: Mon May 11 17:52:45 2020 -0700 Merge pull request #8041 from alek13/patch-1 use supported package for slack commit d1ad111949 Author: Alexander Chibrikin <alek13.me@gmail.com> Date: Mon May 11 20:31:13 2020 +0300 use supported package for slack see https://github.com/maknz/slack/issues/94 commit 31c5350941 Author: snipe <snipe@snipe.net> Date: Fri May 1 01:05:48 2020 -0700 Fixed incorrect route for groups edit Signed-off-by: snipe <snipe@snipe.net> commit 7eb70e17e0 Merge: 5bb4f271a 3dfcb4699 Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:50:37 2020 -0700 Merge pull request #7993 from snipe/fixes/7989_column_selector Fixed #7989 - Converted table heading icons in People to CSS glyphs commit 3dfcb46991 Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:41:08 2020 -0700 Minor formatting changes Signed-off-by: snipe <snipe@snipe.net> commit 96eb96f964 Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:27:00 2020 -0700 Removed stray val (typo) Signed-off-by: snipe <snipe@snipe.net> commit a2f08bd3ba Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:08:54 2020 -0700 Added comments Signed-off-by: snipe <snipe@snipe.net> commit e009fbe59f Author: snipe <snipe@snipe.net> Date: Fri Apr 24 04:04:53 2020 -0700 Converted table heading icons in People to CSS glyphs Signed-off-by: snipe <snipe@snipe.net> commit 5bb4f271aa Author: snipe <snipe@snipe.net> Date: Fri Apr 24 00:47:19 2020 -0700 Fixed #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
snipe	230c9da1df	Fixed #6703 - fixes password confirmation	2019-02-13 21:30:15 -08:00
snipe	533649f24e	Merge branch 'develop' into dev-master-integration ... # Conflicts: # .gitignore # .travis.yml # app/Console/Commands/LdapSync.php # app/Console/Commands/SendExpectedCheckinAlerts.php # app/Console/Commands/SendExpirationAlerts.php # app/Console/Commands/SendInventoryAlerts.php # app/Console/Kernel.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/ManufacturersController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/Auth/ResetPasswordController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/UsersController.php # app/Http/Transformers/AssetMaintenancesTransformer.php # app/Importer/Importer.php # app/Importer/ItemImporter.php # app/Importer/UserImporter.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/License.php # app/Models/Location.php # app/Models/Recipients/AlertRecipient.php # app/Models/User.php # app/Providers/AppServiceProvider.php # composer.json # composer.lock # config/trustedproxy.php # config/version.php # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/lang/ar/admin/settings/general.php # resources/lang/bg/admin/settings/general.php # resources/lang/en-ID/admin/settings/general.php # resources/lang/en-ID/passwords.php # resources/lang/en/passwords.php # resources/lang/es-CO/passwords.php # resources/lang/es-ES/passwords.php # resources/lang/es-MX/passwords.php # resources/lang/es-VE/passwords.php # resources/lang/fi/admin/settings/general.php # resources/lang/id/admin/settings/general.php # resources/lang/id/passwords.php # resources/lang/ja/passwords.php # resources/lang/nl/passwords.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/passwords.php # resources/lang/pt-BR/admin/settings/general.php # resources/lang/pt-BR/passwords.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/admin/statuslabels/table.php # resources/lang/ru/passwords.php # resources/lang/sr-CS/general.php # resources/lang/sr-CS/mail.php # resources/lang/sv-SE/admin/settings/general.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/passwords.php # resources/lang/vi/admin/models/message.php # resources/lang/vi/admin/users/general.php # resources/lang/zh-CN/admin/settings/general.php # resources/views/importer/import.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/users/edit.blade.php # resources/views/users/view.blade.php # tests/unit/ImporterTest.php	2019-02-13 06:42:52 -08:00
Daniel Ruf	af3c8195af	tests: fix expected string (#6665)	2019-01-30 14:12:20 -08:00
Wes Hulette	b38d07064b	Fixed: #5896 Custom fields of type "CUSTOM REGEX" are always saved as "ANY" (#6381) ... * Fixed missing oauth tables during setup. * Custom fields of type "CUSTOM REGEX" are always saved as "ANY" Fixes #5896 * Updated per PR Fixed spelling * Fixed logic error Moved conditional code from view to controller Added getFromatType function for dropdown	2018-12-06 20:05:04 -08:00
snipe	1784278a59	Fixed importer email test	2018-09-26 19:06:09 -07:00
Ivan Nieto	73e88faa00	Using changes proposed by dmeltzer to eliminate has_licenses function in some tests code (#6218)	2018-09-25 14:01:21 -07:00
snipe	2c38036123	Improvement: Better documentation, small refactors (#6017) ... * Better documentation, small refactors * Small comment fixes	2018-08-01 00:06:41 -07:00
Daniel Meltzer	b58c77c8b8	Feature: Import users department. (#5987) ... Maps to the "Department" header key by default. Bug: #5382	2018-07-27 12:02:18 -07:00
Daniel Meltzer	94c79fa69a	Fixed #5964 - Feature: Group IDs can be passed to User Create. (#5990) ... Also added to update, and adjusted api tests to confirm. Long term it might be nice to look at support for passing group names instead. Bug: 5964	2018-07-27 12:01:59 -07:00
snipe	7a9a78ec53	Make Codacy happy by reversing the signature params	2018-07-25 07:14:16 -07:00
snipe	0714ac4248	Update withCounts because Laravel 5.5 :(	2018-07-24 22:40:05 -07:00
snipe	f69e34f6ca	Applying @dmeltzer’s changes from afc8ac5e72	2018-07-24 21:13:02 -07:00
Daniel Meltzer	de413408f5	Port/reenable most unit tests. (#5921) ... * Port/reenable most unit tests. Should probably flesh out notifications tests in the next few days. * Disable json checkin in ApiAssetsTest@index for now. It's broken, but hiding other real broken things. * Re Disable Groups allowDelete	2018-07-23 06:48:21 -07:00
Daniel Meltzer	92671823d8	Userimport fixes/improvements (#5884) ... * Send notification when user is created. * Flesh out default user mappings * Add user importing test.	2018-07-18 19:15:07 -07:00
Daniel Meltzer	cf03d25934	Fix importer emailformat (#5871) ... * Fix Importer emailformat Str::slug() strips periods from the string, which caused our existing logic to misbehave when generating a user's email on an import. Adjust logic to use generateEmail() helper on user instead. Also clean up some of the logic in this method. * Remove dead code. * More refactor/cleanup of the user create method. I think it is almost readable now.	2018-07-17 16:46:08 -07:00
snipe	3fb5f6f5be	Revert	2018-07-17 01:03:25 -07:00
snipe	5dc2ac9e22	Try to fix test ... This is a listing, not a single asset	2018-07-17 00:20:06 -07:00
Daniel Meltzer	638a7b2d91	Assetcontroller cleanup (#5858) ... * Extract method/cleanup * Remove apiStore method that is unusued since api controllers. * Use proper model exception * Remove old user importer. This is now supported by the general importer framework. * Refactor AssetsController methods. This is a giant diff without many functional changes, mostly cosmetic. I've pulled a number of methods out of assetscontroller, preferring instead to create some more targetted controllers for related actions. I think this cleans up the file some, and suggests some places for future targetted improvement. Fix weird missing things. * Fix Unit test failing after date changes. * Pass valid string to be translated. * Some method cleanup for codacy. * Extract trait for common checkout uses and codacy fixes.	2018-07-16 17:44:03 -07:00
Daniel Meltzer	dcf72ce2da	Strip timestamps from comparison for api tests, in an attempt to fix the test failures. (#5847)	2018-07-16 14:41:51 -07:00
Daniel Meltzer	880faa83a6	Importer2 checkout (#5771) ... * Importer: checkout to location, backend changes+tests. * Import location checkout. Frontend changes. * Allow importing of item number/model number for consumables.	2018-07-05 12:22:24 -07:00
snipe	86d398abda	Fixed category test	2018-05-18 14:58:06 -07:00
snipe	883c65981b	More test fixes	2018-05-16 20:09:18 -07:00
snipe	87c6ee2035	Importer test fixes	2018-05-16 19:05:00 -07:00
snipe	aab190423f	Partial fix for license+category tests	2018-05-16 18:35:11 -07:00
Hannah Tinkler	c4c520c1a3	Fixes #4445: prevents assigned assets from being checked out in bulk checkout (#5421) ... * Fixes #4445: prevents assigned assets from being checked out in bulk checkout * Updates data attribute to more versatile 'data-asset-status-type' * Fixes broken unit test	2018-04-25 02:39:23 -07:00
Daniel Meltzer	69478aea58	Avoid populating db manually. (#5255) ... * Avoid populating db manually. Instead rely on a seeded database existing and use api/fucntional tests based on that. * Seed the Setting object with default values. * Update Setting seeder to match web default. Also only generate one Setting instance.	2018-03-27 17:43:28 -07:00
Daniel Meltzer	e9d9c0c42d	Fix #4798. (#5271) ... Filter down the custom fields we are iterating over to only custom fields in the header row. This prevents nulling out fields when performing an import-update that doesn't include all custom fields as well as properly nulls out values between items being imported.	2018-03-27 16:52:44 -07:00
snipe	46f5f21368	Notification improvements (#5254) ... * Added “show fields in email” to custom fields * Added “show images in email” to settings * Added nicer HTML emails * Break notifications out into their own, instead of trying to mash them all together * Remove old notification for accessory checkout * Janky fix for #5076 - “The asset you have attempted to accept was not checked out to you” * Add method for image url for accessories * Added accessory checkout email blade * Make accessory email notification on checkout screen consistent with assets * Added native consumables notifications * Fixes for asset notification * Updated notification blades with correct-er fields * Updated notifications * License checkin notification - does not work yet Need to figure out whether the license seat is assigned to a person or an asset before we can pass the target * Added alternate “cc” email for admins * Only try to trigger notifications if the target is a user * Fix tests * Fixed consumable URL * Removed unused notification * Pass target type in params * Show slack status * Pass additional parameters There is a logic bug in this :( Will send to slack twice, since the admin CC and the user are both using the same notification. Fuckity fuck fuck fuck. * Pass a variable to the notification to supress the duplicate slack message * Slack is broken :( Trying to fix Will try a git bisect * Put preview back into checkout * Pulled old archaic mail * Removed debugging * Fixed wrong email title * Fixed slack endpoint not firing * Poobot, we hardly knew ye. * Removed old, manual mail from API * Typo :-/ * Code cleanup * Use defined formatted date in JSON * Use static properties for checkin/checkout notifiers for cleaner code * Removed debugging * Use date formatter * Fixed target_type * Fixed language in consumable email	2018-03-25 13:46:57 -07:00
Anh DAO-DUY	06e760081c	Add default_label field missing in status_labels table (Travis CI) (#5180)	2018-03-09 13:05:14 -08:00
snipe	d05dfb18a7	Fixed #5150 - added lastname first initial as username format	2018-03-05 21:39:05 -08:00
Daniel Meltzer	9ee2c6be57	Api tests2 (#5098) ... * Cleanup * API tests for asset models and related cleanup/improvements * Api license test. Tests incomplete because create/update/destroy are not implemented yet in the controller * API Category tests. * Manufacturers API Test. * Implement License Create/Update/Delete Methods for API and enable test. * Add missing gate for api. Fixes only superadmins being able to generate Personal Access Toekns	2018-02-25 12:10:02 -08:00
Daniel Meltzer	7de8f71f58	Api tests (#5096) ... * Use the formated date helper to clean up verifications. * Add Checkin/Checkout api tests. * Accessories api test * Add Companies API Test. * Return ModelNotFound as a 404. * Cleanups/simplficiations/updates. * Locations api test. * currency and image should be fillable on location. * Update components api test. * Use findOrFail so we return a 404 instead of a 200. Matches other item types. * order_number should be fillable in component. * Add updated_at and permissions to information returned from api for a user. * Add users test and flesh out factory and fillable fields. * Add test for assets method * API status label test. * Disable php7.2 for now on travis until the count(null) issues are remedied * Add serial to update. * API model not found should return a 200	2018-02-24 19:01:34 -08:00
Daniel Meltzer	d54dda40d3	Functional Tests Improvements (#5095) ... * Rely on laravel transactions instead of refreshing the database dump between functional test runs. Cuts functional test runtime by 75%. Also use mysql to seed directly. * Split functional tests into two groups on travis to reduce overall memory usage. Any new tests will need to be added to one of these two files before they are run on travis. running all functional tests simultaneously still works locally. * Fix name of test in group.	2018-02-24 12:03:33 -08:00
Daniel Meltzer	f7dbda4ed3	Disable broken tests (#5073) ... * Work towards a functional travis. Step 1: Disable broken unit tests. * Fix functional tests This updates the login information and model factories to work with changes to source. * Importer name/full name fixes. Fix a bug where "name" was used ambigously and mapping "item name" to "name" would confuse the importer into thinking it should also be a user name. Now we default to "full name" for the users name, and "item name" for the item name. These are still both configurable through the custom mapping. Also update sample csvs and remove an outdated sample. * Max length of supplier notes is 191, not 255, as per default laravel string length. Might make sense to change this to a text field in the future to match other places. * Use sqlite/different db setup for unit tests. * Fix assets api test. * Fix Components API test. * increase travis memory limit for functional tests. * Use travis config for api tests as well. * Fix memory limit file. * Disable ApiComponentsAssetsCest until it's fixed.	2018-02-22 21:46:58 -08:00
snipe	cbd8409611	Fixed #5067 - account for only one name in generateFormattedNameFromFullName	2018-02-22 14:10:58 -08:00
Daniel Meltzer	5a84863873	Importer name/full name fixes. (#5072) ... Fix a bug where "name" was used ambigously and mapping "item name" to "name" would confuse the importer into thinking it should also be a user name. Now we default to "full name" for the users name, and "item name" for the item name. These are still both configurable through the custom mapping. Also update sample csvs and remove an outdated sample.	2018-02-21 16:42:36 -08:00