Commit Graph

2142 Commits

Author SHA1 Message Date
nad e372811d6e Merge branch 'testing' into feature/22-device-lot-visibility
# Conflicts:
#	ereuse_devicehub/resources/device/views.py
2020-08-05 13:00:22 +02:00
Cayo Puigdefabregas 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
Cayo Puigdefabregas 597ff3dc11 add check of permissions 2020-08-05 12:24:36 +02:00
Cayo Puigdefabregas 19bff82873 fixing spaces in csv file 2020-08-05 12:23:24 +02:00
Cayo Puigdefabregas 96026caabb add new basic snapshot 2020-08-05 12:22:52 +02:00
Cayo Puigdefabregas f424309c17 add second user as user2 in features in conftest 2020-08-05 12:22:06 +02:00
Jordi Nadeu a052abc72d
Minor fix indentation error 2020-08-05 11:56:59 +02:00
Jordi Nadeu eb859ce6c2
Fixing test_get_all_lots 2020-08-05 11:54:43 +02:00
Jordi Nadeu 04557905c8
Merge branch 'testing' into feature/46-device-stock-control 2020-08-05 11:49:18 +02:00
Jordi Nadeu 0318105e84
Merge pull request #44 from eReuse/feature/15-update-test-suite
Feature/15-update-test-suite
2020-08-05 11:44:48 +02:00
Cayo Puigdefabregas 49ea96b862 UniqueViolation intead of DBError in test_snapshot_upload_twice_uuid_error 2020-08-04 12:10:18 +02:00
Cayo Puigdefabregas 2f1d066162 add /document/stock/ to test_api_docs 2020-08-04 10:27:49 +02:00
nad cb55312852 Fixing test_snapshot.py::test_snapshot_post_without_hid 2020-08-03 19:16:11 +02:00
nad 6017476822 Adding query to Lot views 2020-08-03 18:25:55 +02:00
nad a2303498cd Minors comments changes and new test_get_all_lots was added 2020-07-28 16:22:17 +02:00
nad c0fcfcfdbf Creating 'documents/lots/' endpoint 2020-07-28 16:16:17 +02:00
nad b524ec7398 Creating export lots test 2020-07-28 16:14:56 +02:00
nad 322af04ff9 Creating new test for device stock control 2020-07-27 13:57:31 +02:00
nad c90fa4e84e Adding stock row class for new document endpoint 2020-07-27 13:56:56 +02:00
nad 936c042c62 Creating document stock endpoint 2020-07-23 20:55:27 +02:00
Cayo Puigdefabregas 1a6afe29d3 bugfix tag test with cli 2020-07-23 19:20:53 +02:00
Cayo Puigdefabregas 9e57b0aee7 new feature for shell. Create_client 2020-07-23 17:44:24 +02:00
Cayo Puigdefabregas 114613ddf7 document stock 2020-07-23 15:56:51 +02:00
Cayo Puigdefabregas 1b79f76e27 bugfix register desktop no hid no tags 2020-07-23 13:56:19 +02:00
Cayo Puigdefabregas c87552964b add xfail in test_sync_execute_register_desktop_no_hid_no_tag 2020-07-23 08:02:14 +02:00
Cayo Puigdefabregas 08b2fe90d0 bugfix: user before tag_id 2020-07-23 07:56:51 +02:00
Cayo Puigdefabregas 46b985e222 bugfix: defined owner_id in fixture tag_id 2020-07-22 18:40:27 +02:00
Cayo Puigdefabregas dc24599075 bugfix: DBError insted of UniqueViolation in raise check 2020-07-22 15:41:04 +02:00
Cayo Puigdefabregas b01c241685 bugfix econdary_workbench_link tag 2020-07-22 14:25:42 +02:00
Cayo Puigdefabregas 3179bba9e9 bugfix add owner_id when device is create 2020-07-22 14:22:42 +02:00
Cayo Puigdefabregas d728204741 bugfix: adding user when Tag is create 2020-07-22 14:21:38 +02:00
Cayo Puigdefabregas a005d6f597 bugfix test_get_devices 2020-07-22 12:11:21 +02:00
nad a90b4c9b9d Merge branch 'testing' into feature/15-update-test-suite 2020-07-21 15:02:29 +02:00
Santiago L 2d27fdea75
Merge pull request #47 from eReuse/ci/isolated-python-env
Use virtualenv to isolate from VM changes
2020-07-21 13:19:34 +02:00
Santiago L c10ebc3a05 Use virtualenv to isolate from VM changes
e.g. update of 20200709 breaks dependencies with PyYAML
because new package aws-sam-cli has ben added
487c88b726
2020-07-21 13:02:29 +02:00
Cayo Puigdefabregas 546dfd80be bugfix/test_erase_privacy_standards_endtime_sort 2020-07-20 20:21:44 +02:00
Jordi Nadeu 8fd2e06f0a
Merge branch 'testing' into feature/27-permission-posting-action 2020-07-20 15:42:11 +02:00
nad e3abc1d284 Fixing test_workbench.py::test_workbench_fixtures 2020-07-20 12:45:41 +02:00
nad 02040199bb Fixing test_basic.py::test_api_docs and test_workbench.py::test_real_custom 2020-07-15 13:11:50 +02:00
nad ce0aedd0d2 Fixing test_snapshot::test_snapshot_component_add_remove 2020-07-15 11:58:38 +02:00
Jordi Nadeu 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
Jordi Nadeu 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
fedjo d172a0e756
Tag-User relationship (#43)
* Add owner_id reference in tag model and related migration

* Add owner param to views and cli commands and schema

* Create tag which belong to an owner from dummy script
2020-07-07 14:58:55 +02:00
fedjo d2d48280cb
Merge two devices (#40)
* Add authenticated view to merge two devices

* Assign actions of argument device to device

* Merge device components

* Sloppy implementation to test

* Correctly update base device

* Correctly append actions
2020-07-07 14:58:37 +02:00
fedjo 9ad217fc5b
Update REAMDE (#36) 2020-06-09 11:33:01 +03:00
Jordi Nadeu f735329e22
Merge pull request #30 from eReuse/feature/alembic-migrations
alembic migrations
2020-06-04 11:15:54 +02:00
yiorgos marinellis 8d112c1360 Abort snapshot action if current user is not owner of the
(non-component) device
2020-06-01 20:43:10 +03:00
fedjo c3cffbeaa7 Add callable to get inventory from command line 2020-05-22 18:43:01 +02:00
fedjo b0fa24b9bf Add alembic dependency in requirements.txt 2020-05-22 16:12:05 +02:00
fedjo 3e87c1bf3d
Fix rst errors in README 2020-05-15 20:21:22 +02:00