25f3cdb172
Merge pull request #71 from eReuse/bugfix/69-ereuseprice-computer-type
...
Bugfix/69 ereuseprice computer type
2020-10-28 17:59:37 +01:00
0106728e4f
complet test for basic manual merge
2020-10-28 13:29:45 +01:00
889ee84f6a
base of test merge
2020-10-27 19:14:23 +01:00
5c6803a467
Update proposal_extended_csv_report.csv
2020-10-22 17:15:14 +02:00
95bea41f02
Update complete.export.snapshot.yaml
...
Change endTime EraseSectors to make sense
2020-10-22 16:57:42 +02:00
4847bdd19d
change test for new csv
2020-10-22 15:54:42 +02:00
216e748594
fixed test
2020-10-21 23:18:53 +02:00
a7c5460925
fixed test
2020-10-21 23:11:13 +02:00
0a447ad816
fixed test
2020-10-21 23:04:49 +02:00
1b772af374
fixed test
2020-10-21 22:56:57 +02:00
ef4c6af5ae
fixed test
2020-10-21 22:48:40 +02:00
c23c16eee8
fixing test basic
2020-10-21 22:33:58 +02:00
fef2701ae3
add files for the test
2020-10-21 22:08:20 +02:00
4ec0149375
add asserts to test
2020-10-21 22:07:56 +02:00
2bababd69f
fixing test
2020-10-21 13:05:28 +02:00
10843b907d
adding test
2020-10-19 13:06:54 +02:00
0c5897a06c
fixed test of devices
2020-10-16 16:42:43 +02:00
3988079b01
drop pdb
2020-10-16 16:32:16 +02:00
e00c3f576c
document new function
2020-10-16 16:31:54 +02:00
7313f7cf73
fixed test
2020-10-16 16:26:37 +02:00
139c1e290a
resolve conflict
2020-10-16 15:12:21 +02:00
76806299cd
update devices when there are a new action
2020-10-16 15:08:54 +02:00
75b5a4a710
Adding test and fix for Issue 69 EreusePrice Computer type
2020-10-15 13:19:47 +02:00
a7c3ea7317
Adding workbench file for Issue 69 EreusePrice Computer type
2020-10-15 13:18:51 +02:00
79b4c738e9
change the name of the file
2020-10-15 11:00:11 +02:00
e4cf093b4b
test of case when the time mark need to be updated
2020-10-14 13:41:28 +02:00
150c73779d
adding new tests of snapshots
2020-10-14 11:40:33 +02:00
d3ef6cc65d
add user to the name file of json and more readable date
2020-10-13 15:59:39 +02:00
ae98d3154c
TMP_SNAPSHOTS defined in config file
2020-10-13 15:37:21 +02:00
49668a4f4f
open files using with statement
2020-10-09 20:54:12 +02:00
99a12b2b22
bugfix
2020-10-09 20:40:22 +02:00
2a53e1672c
using os.path.join instead of format
2020-10-09 20:29:02 +02:00
3b93012584
fixing test with a bad snapshot
2020-10-08 14:48:22 +02:00
e36256ee72
clean test
2020-10-07 19:28:52 +02:00
420b7ad4ab
adding test_save_snapshot_in_file
2020-10-07 19:05:52 +02:00
236806466a
test backup snapshot
2020-10-07 18:28:07 +02:00
e6b2a92f7f
base of the test with out serial number
2020-10-07 12:57:14 +02:00
cac9206dc9
resolve confict
2020-09-30 09:30:17 +02:00
c6500b9ae6
move the test in the specific files
2020-09-22 12:52:15 +02:00
fed6b57bbe
import __version__ instead of open file __init__
2020-09-22 11:57:39 +02:00
66f963e90e
bugfix adding re in test
2020-09-21 11:48:48 +02:00
7f9be17c92
change pkg_resources for open __init__ in test too
2020-09-21 11:46:02 +02:00
773bf3a200
fixing test_basic
2020-09-21 11:14:50 +02:00
aaaf118028
adding test of get version
2020-09-18 11:32:20 +02:00
927594f7a7
Merge pull request #50 from eReuse/feature/endpoints
...
Adding basic tests endpoints
2020-08-25 10:25:04 +02:00
b61398ee59
Adding two users on test_get_document_lots to check lot permissions
2020-08-18 21:02:47 +02:00
1fccea2bcc
Merge remote-tracking branch 'origin/testing' into feature/33-export-lot-description
...
# Conflicts:
# ereuse_devicehub/resources/documents/documents.py
# tests/test_documents.py
2020-08-18 19:31:43 +02:00
6087044a5e
Fixing test_get_multiple_lots and test_api_docs
2020-08-18 19:19:18 +02:00
a2b2be77f4
fixing get_device permissions
2020-08-18 12:35:04 +02:00
3e653ee190
Merge branch 'testing' into feature/endpoints
2020-08-18 12:15:50 +02:00
5c7444dc4d
Merge remote-tracking branch 'origin/testing' into feature/33-export-lot-description
...
# Conflicts:
# ereuse_devicehub/resources/documents/documents.py
# ereuse_devicehub/resources/lot/views.py
# tests/test_documents.py
2020-08-18 11:23:50 +02:00
86cd36f3f8
change name of test_create_tag for test_get_tag
2020-08-17 18:46:44 +02:00
2461a7c73f
test endpoints
2020-08-17 12:51:38 +02:00
b6138f9108
Merge branch 'testing' into feature/46-device-stock-control
2020-08-17 11:33:27 +02:00
59932ba00d
Adding exceptions to device_row.py file
2020-08-17 11:18:52 +02:00
c76c9d58f8
Deselect export tests for mvp
2020-08-12 11:59:12 +02:00
f97b239abe
fixed bug diference model
2020-08-06 16:52:12 +02:00
d973b479cf
return to put anonymous access to erasures documents
2020-08-06 15:55:14 +02:00
27ab4cf2ef
user instead of client
2020-08-05 18:19:27 +02:00
b90047bc4a
Merge branch 'feature/46-device-stock-control' of https://github.com/eReuse/devicehub-teal into feature/46-device-stock-control
2020-08-05 12:25:12 +02:00
597ff3dc11
add check of permissions
2020-08-05 12:24:36 +02:00
19bff82873
fixing spaces in csv file
2020-08-05 12:23:24 +02:00
96026caabb
add new basic snapshot
2020-08-05 12:22:52 +02:00
f424309c17
add second user as user2 in features in conftest
2020-08-05 12:22:06 +02:00
eb859ce6c2
Fixing test_get_all_lots
2020-08-05 11:54:43 +02:00
04557905c8
Merge branch 'testing' into feature/46-device-stock-control
2020-08-05 11:49:18 +02:00
49ea96b862
UniqueViolation intead of DBError in test_snapshot_upload_twice_uuid_error
2020-08-04 12:10:18 +02:00
2f1d066162
add /document/stock/ to test_api_docs
2020-08-04 10:27:49 +02:00
cb55312852
Fixing test_snapshot.py::test_snapshot_post_without_hid
2020-08-03 19:16:11 +02:00
a2303498cd
Minors comments changes and new test_get_all_lots was added
2020-07-28 16:22:17 +02:00
b524ec7398
Creating export lots test
2020-07-28 16:14:56 +02:00
322af04ff9
Creating new test for device stock control
2020-07-27 13:57:31 +02:00
1a6afe29d3
bugfix tag test with cli
2020-07-23 19:20:53 +02:00
1b79f76e27
bugfix register desktop no hid no tags
2020-07-23 13:56:19 +02:00
c87552964b
add xfail in test_sync_execute_register_desktop_no_hid_no_tag
2020-07-23 08:02:14 +02:00
08b2fe90d0
bugfix: user before tag_id
2020-07-23 07:56:51 +02:00
46b985e222
bugfix: defined owner_id in fixture tag_id
2020-07-22 18:40:27 +02:00
dc24599075
bugfix: DBError insted of UniqueViolation in raise check
2020-07-22 15:41:04 +02:00
b01c241685
bugfix econdary_workbench_link tag
2020-07-22 14:25:42 +02:00
3179bba9e9
bugfix add owner_id when device is create
2020-07-22 14:22:42 +02:00
d728204741
bugfix: adding user when Tag is create
2020-07-22 14:21:38 +02:00
a005d6f597
bugfix test_get_devices
2020-07-22 12:11:21 +02:00
546dfd80be
bugfix/test_erase_privacy_standards_endtime_sort
2020-07-20 20:21:44 +02:00
e3abc1d284
Fixing test_workbench.py::test_workbench_fixtures
2020-07-20 12:45:41 +02:00
02040199bb
Fixing test_basic.py::test_api_docs and test_workbench.py::test_real_custom
2020-07-15 13:11:50 +02:00
ce0aedd0d2
Fixing test_snapshot::test_snapshot_component_add_remove
2020-07-15 11:58:38 +02:00
d041ef6a54
First iteration test suite mvp ( #37 )
...
* First commit marking mvp decorator
* Minor code style enhancements
* Fixing some mvp test
* Fixing some mvp test
* Fixing test_sync_execute_register_no_hid_tag_not_linked
* First iteration with almost all mvp tests working correctly
* Rollback models.pyi of lot and device resources
* Changing Github action to execute tests with tag mvp
2020-07-07 17:17:41 +02:00
75150437b6
Adding severity to incomplete HID when POST an action Snapshot ( #32 )
...
* Adding severity to incomplete HID snapshot
* Minor fixes when HID are null
2020-07-07 17:17:19 +02:00
115986c7e0
Adding test to check if upload snapshot without HID fields
2020-03-25 21:32:48 +01:00
ce8bcc7577
Fixing test api docs
2020-03-11 13:22:24 +01:00
d1cff3e44e
first iteration integration with blockchain
2020-03-11 13:04:18 +01:00
92709512d0
Fix path without __file__
2019-07-07 21:38:37 +02:00
ce961a1bed
Add MakeAvailable and Repair; add device.image; add templating file, change layout for project LOT
2019-07-07 21:36:09 +02:00
f8ec8fc882
Change ReadyToUse for Available
2019-07-06 15:06:22 +02:00
922a8c743a
Fix last commit changes
2019-07-02 10:42:56 +02:00
c92d6b3282
Merge branch 'rate' into devel
2019-07-01 11:31:18 +02:00
7e8c36ab3e
Snyc with new Workbench models; fix SSL bug
2019-06-29 16:26:14 +02:00
3d6fef9927
change comments to comply with the standard PEP 257
2019-06-19 13:35:26 +02:00
02b92e2cf7
fix error in test multiple rates
2019-06-19 11:41:22 +02:00
b0d8ca39fe
Merge remote-tracking branch 'origin/rate' into rate
2019-06-12 16:50:08 +02:00
928863bfdf
Update comments in actions; remove workbench folder in rate
2019-06-12 16:49:55 +02:00
970e1db228
improve reports and rate tests
2019-05-20 19:32:29 +02:00
82bf20ff3d
debug and improve tests about rate v1
2019-05-14 20:32:24 +02:00
61f4c127d4
Change event to action complying with schema.org
2019-05-11 16:27:22 +02:00
0dc8ced255
Sort events by default using end_time
2019-05-10 18:00:38 +02:00
58be2162f7
Fix imprecisions in rate algorithms and small bugfixes
2019-05-10 11:58:38 +02:00
16d00256df
Review rate changes
2019-05-08 19:12:05 +02:00
e6d496872c
Merge branch 'master' into rate
...
# Conflicts:
# ereuse_devicehub/resources/event/models.py
# ereuse_devicehub/resources/event/models.pyi
# ereuse_devicehub/resources/event/schemas.py
2019-05-03 15:02:09 +02:00
92be9c1aa1
Add fields in display and device; add battery, measureBattery
2019-05-03 14:31:49 +02:00
7bb514d23c
rewrite some tests to rate v2 structure
2019-05-02 17:49:15 +02:00
2108526cec
fix some snapshots errors
2019-04-30 10:26:06 +02:00
1ca7df4969
refactor score fixtures files (snapshots) to new rate v2 structure
2019-04-30 02:03:09 +02:00
7b6a2cd1db
refactor score code to new rate v2 structure
2019-04-30 02:02:23 +02:00
5ec7ed54e6
refactor tests to new rate version
2019-04-23 21:30:08 +02:00
75e1817e9c
pass rate workbench test v1
2019-04-16 17:47:28 +02:00
8f4231dc1c
Merge branch 'master' into rate
...
# Conflicts:
# ereuse_devicehub/resources/event/models.py
2019-04-10 11:20:54 +02:00
17705e459e
adding more functionality test rate v2
2019-04-10 10:46:43 +02:00
d0eb5cd9c5
first iteration tests ratev2
2019-03-13 16:32:59 +01:00
c5da07ef9c
Add new tests and update some fixtures
2019-03-06 18:44:21 +01:00
13ffab7022
Move export to Documents
2019-02-28 18:21:24 +01:00
208814ecf2
Merge branch 'master' into reports
...
# Conflicts:
# ereuse_devicehub/resources/device/views.py
# tests/test_rate_workbench_v1.py
# tests/test_workbench.py
2019-02-28 17:31:18 +01:00
ddb1877133
first commit rate v2; adding Quality, Functionality Rates class
2019-02-27 23:36:26 +01:00
07e8be829e
Unify Snapshot's POST view with Devicehub's; bugfixes
2019-02-18 12:43:50 +01:00
32e696c57c
Fix rate related issues
2019-02-13 18:59:14 +01:00
15f705dd50
Add Tests managing inventories; small bugfixes
2019-02-11 21:34:45 +01:00
6c4c89ac48
Use Postgres 11; enhance search query with websearch; really use indexes, add hash index; fix partially patching lots
2019-02-07 13:47:42 +01:00
d6ca5e2922
Fix incorrect dates; add final_flush, move committing after serializing
2019-02-04 18:20:50 +01:00
2cbaf14c45
Only optionally drop common db
2019-02-04 13:38:46 +01:00
bf8a943883
Remove re-setting ordered_components hotfix; bump ereuse-utils
2019-01-29 19:01:20 +01:00
74860be347
Add things_response; create tags through ereuse Tag
2019-01-26 12:49:31 +01:00
f570e9d3d0
Add inventories with dispatcher
2019-01-23 16:55:04 +01:00
f0f1376b7d
Small bugfixes
2019-01-19 19:19:35 +01:00
b1aa79fd0a
Small bugfixes
2019-01-16 20:40:27 +01:00
5fb1471d9b
Use type for HID
2019-01-02 17:52:43 +01:00
4c4133c347
debug rate workbench tests
2018-11-27 19:06:28 +01:00
d5a71a7678
Add document resource and erase certificate
2018-11-21 14:26:56 +01:00
b59721707d
Fix test_snapshot_different_properties_same_tags
2018-11-17 20:21:11 +01:00
91beed87ee
Working Price; working test mobile with imei; update manual rate test
2018-11-17 19:22:41 +01:00
9c3de1c258
Complete ErasePhysical and EraseBasic.standards; remove EraseBasic.zeros
2018-11-17 18:24:34 +01:00
955fb4a33d
Add processes and empty tests
2018-11-17 17:03:03 +01:00
0cc2bdba4d
Add skeleton for computing erasure standards
2018-11-15 13:35:19 +01:00
3e636ea2c9
fix reports test and fixtures
2018-11-13 17:58:26 +01:00
ee231aecb9
Merge remote-tracking branch 'origin/master' into reports
...
# Conflicts:
# ereuse_devicehub/resources/device/views.py
2018-11-13 16:58:47 +01:00
0a9fbb0226
Delete lots; add LotParent view; use parents, all_devices relationships; return uiTree with list of lots and parents
2018-11-13 15:52:27 +01:00
560e0ed8dc
Add docstrings to event models; remove redundant generic test
2018-11-12 18:15:24 +01:00
0ec06808ce
Add Mixer
2018-11-12 11:59:49 +01:00
bcf59de383
Delete lots; add LotDeviceDescendants view really fixing querying devices in lots
2018-11-11 21:52:55 +01:00
bd0eb3aad3
Add Device problems, privacy, working; Add event ErasePhysical
2018-11-09 11:22:13 +01:00
e009bf4bc1
Change Event.error/incidence for Event.severity
2018-11-08 17:37:14 +01:00
b5e3d0c6ec
Add description in lot, xfail test for lot delete
2018-11-06 18:08:57 +01:00
5bc72fbe8b
Fix inconsistencies in filtering devices inside lots
2018-11-04 22:40:14 +01:00
afb2815883
Add regenerate-search
2018-10-31 12:27:16 +01:00
2d525231c3
Fix searching for IDs, numbers, HP, and Asus
2018-10-31 11:40:45 +01:00
96933b4d7e
Fix David wrong endTime
2018-10-27 09:31:53 +02:00
784c5d2298
xfail test_snapshot_real_eee_10001pxd
2018-10-27 09:06:15 +02:00
a600dd8e54
Fix test_test_data_storage
2018-10-27 09:01:13 +02:00
42c5bee947
Fix benchmark rates not using floats; add oreo and david's pc
2018-10-27 08:56:58 +02:00
78121d39b9
Update fixtures csv files
2018-10-25 13:39:28 +02:00
81051e9951
Add assert 'Register in' is a date
2018-10-25 12:40:58 +02:00
73c79fc827
Add todo in tests rate and workbench
2018-10-25 12:39:33 +02:00
8567c629cb
Add new fixtures and dummy
2018-10-25 12:36:25 +02:00
c299656f05
Add fixtures csv files and exports tests
2018-10-24 21:09:54 +02:00
cad0b64125
Merge remote-tracking branch 'origin/master' into reports
2018-10-23 17:37:43 +02:00
50a365b4bf
add basic.csv file to use in test_reports
2018-10-23 17:36:53 +02:00
6abc11b40c
Add keyboard fixture
2018-10-23 16:24:50 +02:00
3978e606fd
Add rates to dummy computers
2018-10-23 16:24:26 +02:00
10c73a4e75
Add ComputerAccessory, Networking, Printer, Sound, Video devices
2018-10-23 15:37:37 +02:00
7ad7ab1d8a
PATCH lot name
2018-10-19 10:35:23 +02:00
654edf35a1
Add if in find 'text/csv'
2018-10-18 18:16:49 +02:00
40d3529221
Add test assert csv
2018-10-18 17:36:14 +02:00
6751f0db16
Change manufacturer endpoint query name for search
2018-10-18 13:08:42 +02:00
03871b4462
Fix tags not added to device search
2018-10-18 10:09:10 +02:00
c4129a2a1a
Merge remote-tracking branch 'origin/master' into reports
2018-10-17 12:31:31 +02:00
4b763ed1e8
Bigfixes for tag demo
2018-10-16 16:30:10 +02:00
b391950d97
Add str() to many events; small bugfixes
2018-10-16 08:46:55 +02:00
79f41f3501
Merge remote-tracking branch 'origin/master' into reports
2018-10-15 14:50:59 +02:00
06d6e31c99
Merge remote-tracking branch 'origin/master' into reports
2018-10-15 14:43:46 +02:00
47f5bf69ae
Return ranges in AggregateRate
2018-10-15 14:20:26 +02:00
5301242dbd
Fix not adding tag.secondary to search
2018-10-15 13:12:13 +02:00
8889496a34
Fix Price not always using Decimal
2018-10-15 11:21:21 +02:00
97536c5ce1
Fix bug when device rate is low
2018-10-14 23:56:54 +02:00
9cffa92125
Update description of Rate and Device; remove PhotoboxRate schemas
2018-10-14 20:10:52 +02:00
10c1a3f37d
Bugfixes with rate
2018-10-14 11:37:10 +02:00
3cc510831c
Add states and quick-access properties on Device; merge in ereuse-rate
2018-10-13 14:53:46 +02:00
e92f64d88d
Add test_reports file
2018-10-11 18:19:33 +02:00
319e041ebc
Small improvements in lots and related testing
2018-10-11 11:22:59 +02:00
923ed8af68
Change lot view's filter for search
2018-10-08 17:51:51 +02:00
df31074775
Toggle formats when finding lots; add device.lots when GETting devices
2018-10-08 17:32:45 +02:00
a3f6d7877a
Change name to title when returning lots
2018-10-08 12:25:28 +02:00
a76560d253
Better printing in Dummy; change naming of TestHardDriveLength; bump utils to 0.4b9
2018-10-08 10:37:32 +02:00
863578559c
Filter devices by being inside lots
2018-10-06 12:45:56 +02:00
7e4a0981a1
Add /lots/ find method returning nested lots
2018-10-05 18:57:35 +02:00
4f0493c464
Update pagination and return URL for Lot, Device, Event resources
2018-10-05 17:13:23 +02:00
d1a23cbf9d
Fix failing click dummy execution; speed-up testing
2018-10-05 14:35:51 +02:00
94c44e3480
Add Smartphone; remove Inventory and use DeviceView
2018-10-04 10:59:31 +02:00
77c96c5956
Add public device view
2018-10-03 14:51:22 +02:00
38060d47ec
Add Manufacturer
2018-09-30 19:40:28 +02:00
042b7718ec
Use SanitizedStr and CITText, lowering many strings
2018-09-30 12:29:33 +02:00
517c21789d
Fix not creating tags with providers; check if default org is created
2018-09-29 19:39:38 +02:00
c0073e9212
Add DeviceSearch
2018-09-29 12:24:22 +02:00
Jordi Nadeu
Cayo Puigdefabregas
nad
jordi.nadeu
Xavier Bustamante Talavera