Commit graph

133 commits

Author SHA1 Message Date
Luka Murn
bf59276afd Merge branch 'mc-SC-2703' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SC-2703
Conflicts:
	spec/requests/api/v1/inventories_controller_spec.rb
2018-10-01 11:41:29 +02:00
Luka Murn
870dda255c Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scinote-web-1 into core-api
Conflicts:
	spec/requests/api/v1/inventory_items_controller_spec.rb
2018-10-01 09:20:58 +02:00
Luka Murn
2ac6563730
Merge pull request #1295 from czbiohub/mc-SCI-2702
close SCI-2702; unit tests for create inventory [SCI-2702]
2018-10-01 09:08:39 +02:00
Michael
2f99904000 merge core-api and handle merge issues 2018-09-27 10:43:52 -07:00
Michael
088e06cae7 fix check to inventory 2018-09-26 10:47:13 -07:00
Luka Murn
07c8c448d5 Fix codestyle 2018-09-26 18:30:07 +02:00
Luka Murn
46883150d1 Merge branch 'mc-SCI-2696' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SCI-2696
Conflicts:
	spec/requests/api/v1/inventory_items_controller_spec.rb
2018-09-26 18:16:25 +02:00
Luka Murn
d0d0939afd Move @valid_headers content type to global @valid_headers def 2018-09-26 18:13:10 +02:00
Luka Murn
39dafd2179 Merge branch 'mc-SC-2701' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SC-2701
Conflicts:
	spec/requests/api/v1/inventory_columns_controller_spec.rb
2018-09-24 16:40:44 +02:00
Luka Murn
3b3d682ab2
Merge pull request #1294 from czbiohub/mc-SCI-2699
add unit tests for Create inventory_column endpoint [SCI-2699]
2018-09-12 15:39:18 +02:00
Luka Murn
8e376a0293 Hound is love, Hound is life. 2018-09-12 13:47:52 +02:00
Luka Murn
0b68a670c2 Fix the inventory_columns_controller#create action
Based on unit tests, fix the create inventory columns endpoint
to work as intended. Also add another unit test case.
2018-09-12 13:44:10 +02:00
Michael
9fab092c31 remove funky symbol 2018-09-11 09:55:38 -07:00
Michael
4b41cc9566 close mc-SC-2703; unit tests for DELETE inventory endpoints 2018-09-09 14:58:56 -07:00
Michael
f9f9bcac9f same changes to update unite tests 2018-09-09 14:03:56 -07:00
Michael
849a147756 failing tests for update, to_i doesn't work with updated changes 2018-09-09 14:02:22 -07:00
Michael
beff430b61 unit tests for DELETE inventory [SCI-2704] 2018-09-09 13:37:26 -07:00
Michael
e2c10e973d close mc-SC-2701; DELETE inventory column endpoint unit tests 2018-09-09 13:15:54 -07:00
Michael
43a3c1c06b close SCI-2702; unit tests for create inventory 2018-09-09 13:02:42 -07:00
Michael
436876ad76 close SCI-2699; add unit tests for Create inventory_column endpoint 2018-09-09 00:15:56 -07:00
Michael
c0f0f0ea81 close SCI-2698; unit tests for DELETE inventory item 2018-09-07 15:11:53 -07:00
Michael
212bdfeffe close SCI-2696 2018-09-06 17:54:24 -07:00
Michael
c22ad02858 inventory_item #create correct response unit test 2018-09-06 13:45:28 -07:00
Oleksii Kriuchykhin
5488fc66fc Refactor JSON API mime type registration [SCI-2687] 2018-08-24 15:37:23 +02:00
Oleksii Kriuchykhin
c8abb3d9b8 Add user_identities CRUD endpoints, make API V1 togglable [SCI-2664][SCI-2686] 2018-08-24 15:27:59 +02:00
Alex Kriuchykhin
eb2d3e7951
Merge pull request #1276 from okriuchykhin/ok_SCI_2613
Add READ user endpoint [SCI-2613]
2018-08-24 15:23:05 +02:00
Oleksii Kriuchykhin
a8013118d4 Add READ user endpoint [SCI-2613] 2018-08-21 13:56:14 +02:00
Oleksii Kriuchykhin
ef7e0ac489 Add GET inventory columns API endpoint [SCI-2615] 2018-08-08 17:31:37 +02:00
Oleksii Kriuchykhin
6c59e1e159 Fix failing tests [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
4df9a4c9ca Fix code style warnings [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
8d11e03d47 Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin
dc2411c5ed Fix Hound warnings [SCI-2611][SCI-2612] 2018-08-08 16:27:43 +02:00
Oleksii Kriuchykhin
22e12d8fc3 Add GET teams and team API endpoints [SCI-2611][SCI-2612] 2018-07-31 13:40:27 +02:00