68 Commits

Author SHA1 Message Date
ChrisTerBeke
3b0cfc270f Fix unit test for device name 2019-04-18 14:43:53 +02:00
Ghostkeeper
ae9395aebb
Merge branch 'master' into WIP_onboarding 2019-04-03 11:53:40 +02:00
Ian Paschal
58f1c05564 Actually fix tests
Contributes to CL-1266
2019-03-29 12:27:58 +01:00
Ian Paschal
4581c1f138 Fix UM3NetworkPrinting test
Contributes to CL-1266
2019-03-28 16:20:01 +01:00
Lipu Fei
4a171eebf6 Move models around again
- Move machine related models to cura.Machines.Models
 - Move printer device related models to cura.PrinterOutput.Models
 - Other UI/GUI related modules in cura.UI
2019-03-26 08:29:22 +01:00
Lipu Fei
6a8db55112 Move PrinterOutputModel into cura.UI module 2019-03-20 09:43:10 +01:00
Ian Paschal
c9d99e0149 Revert "Adapt tests to manual IP connection"
This reverts commit d758189aafe809397a6caa9616a09e41bb5ef251.
2019-03-06 13:11:43 +01:00
Ian Paschal
d758189aaf Adapt tests to manual IP connection
Contributes to CL-1266
2019-03-05 09:28:18 +01:00
ChrisTerBeke
f25fefdbcb Add expected mesh back to test 2019-02-15 17:24:03 +01:00
ChrisTerBeke
3f11cb911d Add filesize back to expected result 2019-02-15 17:06:32 +01:00
ChrisTerBeke
897c932e80 Fix test for cloud output device ufp uploading 2019-02-15 17:03:38 +01:00
ChrisTerBeke
119c868650 Add a test for the device properties 2019-02-15 16:52:11 +01:00
Jaime van Kessel
894dbcf6f6 Revert "Added skip mark to failing cloud tests"
This reverts commit 665c33156468270e53fb2702f7d60f0deab0618a.
2019-01-17 14:43:43 +01:00
Jaime van Kessel
c6628560bb Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into 4.0 2019-01-17 14:42:56 +01:00
Jaime van Kessel
665c331564 Added skip mark to failing cloud tests 2019-01-17 13:04:04 +01:00
Daniel Schiavini
badb0b0ca9 Use patch.object to allow relative imports
Issue STAR-322.
2019-01-17 12:58:23 +01:00
ChrisTerBeke
aab1fbc73f Try other patch values for relative imports 2019-01-17 10:22:37 +01:00
ChrisTerBeke
de24c7d9c3 Revert "Remove mock changes used locally"
This reverts commit 7785555a943b600636809ae5c5e50cabecdd79fd.
2019-01-15 09:35:28 +01:00
Daniel Schiavini
7785555a94 Remove mock changes used locally 2019-01-15 08:21:17 +01:00
Daniel Schiavini
77c30c891f Fix tests 2019-01-15 08:20:39 +01:00
ChrisTerBeke
13d390a7d9 Fix imports in tests, some cleanup 2019-01-14 10:43:32 +01:00
ChrisTerBeke
7bbd43928a Fix more review comments 2019-01-11 16:38:25 +01:00
ChrisTerBeke
3c10cca0de Fixed all codestyle and nitpicks from review 2019-01-11 16:33:49 +01:00
ChrisTerBeke
e465bd771a Use toolpath instead of mesh, some review fixes 2019-01-11 16:18:47 +01:00
ChrisTerBeke
485b471522 Fix some review comments 2019-01-08 12:19:00 +01:00
ChrisTerBeke
a6114d39e4 Fix merge conflicts with 4.0 2019-01-08 11:49:36 +01:00
Lipu Fei
346d8d884e Remove unnecessary patches in TestSendMaterialJob
CURA-6035
2018-12-20 14:23:39 +01:00
Lipu Fei
e79f312fa0 Fix unit tests for SendMaterialJob
CURA-6035
2018-12-20 14:20:34 +01:00
Daniel Schiavini
da974d9868 STAR-322: Improving documentation 2018-12-17 14:51:57 +01:00
Daniel Schiavini
75d7d49349 STAR-322: Mocking the CuraApp 2018-12-17 14:41:28 +01:00
Daniel Schiavini
3b367938de STAR-322: Removing TestSendMaterialJob temporarily 2018-12-17 13:53:31 +01:00
Daniel Schiavini
b6f90f1ab2 STAR-322: Using cura constants 2018-12-17 13:29:20 +01:00
Daniel Schiavini
a1cb09f73f STAR-322: Sorting clusters 2018-12-17 13:24:07 +01:00
Daniel Schiavini
87c1392173 STAR-322: Fixing tests 2018-12-17 12:05:25 +01:00
Daniel Schiavini
e815d5da8f STAR-322: Avoiding lambdas and direct callbacks to avoid gc 2018-12-14 16:02:28 +01:00
Daniel Schiavini
2f08854097 STAR-322: Using QNetworkReply.finished signal instead of QNetworkAccessManager.finished 2018-12-14 14:50:15 +01:00
Daniel Schiavini
fed779d0d2 STAR-322: Implementing multi-part upload (doesnt always work) 2018-12-12 17:31:08 +01:00
Daniel Schiavini
d54fc4182b STAR-322: Fixing style errors 2018-12-11 11:56:36 +01:00
Daniel Schiavini
7668801564 STAR-322: Adding documentation and fixing model types 2018-12-11 11:12:32 +01:00
Marijn Deé
fa7cab3246 Merge branch 'STAR-322_cloud-connection' of github.com:Ultimaker/Cura into STAR-322_cloud-connection 2018-12-11 09:27:48 +01:00
Marijn Deé
3b54cb4b24 Use the NetworkManagerMock, added tests for the other functions 2018-12-11 09:27:40 +01:00
Marijn Deé
99cfef6cdc Use the NetworkManagerMock, added tests for the other functions 2018-12-11 09:25:26 +01:00
Daniel Schiavini
0357003e69 STAR-322: Testing encode independent 2018-12-10 21:47:06 +01:00
Daniel Schiavini
bfd236dae4 STAR-322: Testing cloud printing 2018-12-10 16:11:43 +01:00
Daniel Schiavini
d482924ea2 STAR-322: First tests for cloud output device 2018-12-10 14:43:02 +01:00
Marijn Deé
e5124532f8 getClusterStatusResponse as fixture 2018-12-10 14:03:43 +01:00
Daniel Schiavini
f432d7c858 STAR-322: Using a test setup to run tests with Cura app 2018-12-10 13:11:42 +01:00
Daniel Schiavini
134f97d5f1 STAR-322: Finishing the output device manager tests 2018-12-10 11:30:02 +01:00
Daniel Schiavini
75c2e25a01 STAR-322: Testing more of the device manager 2018-12-10 10:43:22 +01:00
Daniel Schiavini
c495ade2d3 STAR-322: Documenting the network manager mock 2018-12-10 09:42:26 +01:00