Commit Graph

57 Commits

Author SHA1 Message Date
Martin Marmsoler
f1127ac81b turn on all tests 2022-07-13 09:22:02 +02:00
Martin Marmsoler
01271d68da update rebase tests 2022-07-13 08:29:31 +02:00
Martin Marmsoler
8bac63bb68 fix second test 2022-07-11 11:30:46 +02:00
Martin Marmsoler
b4828839a8 window.show() must be done, otherwise windowHandle() is not loaded and therefore a nullptr exception happens. Use MainWindow on stack so it must not be deleted afterwards 2022-07-08 13:06:08 +02:00
Martin Marmsoler
eac0d96ff1 WIP 2022-07-01 08:56:28 +02:00
Martin Marmsoler
58be827b3a Update rebase.cpp 2022-06-29 18:05:05 +02:00
Martin Marmsoler
2e9f4b0ed8 initial commit for rebaseMergeConflicts 2022-06-29 17:29:09 +02:00
kas
db6ce24fe8 Use official name for macOS 2022-06-19 15:33:16 +02:00
Martin Marmsoler
1f91c72e6a use committer also for revert 2022-06-09 07:48:20 +02:00
Martin Marmsoler
c9f86c81b7 distinguish between author and committer. So when cherry picking, the changes will be committed, but the author will not be overwritten, only the committer. 2022-06-09 07:47:32 +02:00
kas
ef28a1b218 Fix tests on Windows
Qt 5.15.2 has no QPlatformNativeInterface for non-X11 platforms, leading to a NULL pointer dereference when showing a message box
See https://github.com/qt/qtbase/blob/v5.15.2/src/plugins/platforms/offscreen/qoffscreenintegration.cpp#L232

The tests failing because of that are now labeled "NO_WIN32_OFFSCREEN"
and can be ignored using the CMake target "check_no_win32_offscreen"
2022-06-08 13:43:21 +02:00
Martin Marmsoler
69dd2adcdd move FileWidget to stack, so no delete is needed. All blocks are surrounded by brackets 2022-06-07 21:06:30 +02:00
Martin Marmsoler
d50ba88a97 format 2022-06-07 16:53:16 +02:00
Martin Marmsoler
f2ce63209f add forgotten #endif 2022-06-07 16:51:10 +02:00
Martin Marmsoler
d34584041d fix linux test 2022-06-07 08:57:47 +02:00
Martin Marmsoler
af8ede7675 add comment 2022-06-07 08:46:13 +02:00
Martin Marmsoler
397e4f53f9 use stack variables, so no delete is needed 2022-06-07 08:32:10 +02:00
Murmele
b92ac0cdf2
Update test/EditorLineInfos.cpp 2022-06-01 09:16:42 +02:00
Martin Marmsoler
927e1172ff format and remove not needed function 2022-05-30 10:04:26 +02:00
Martin Marmsoler
bf1cd57611 add test for multihunks 2022-05-29 12:03:08 +02:00
Martin Marmsoler
5fe8c66815 add test for crlf 2022-05-29 12:03:06 +02:00
Martin Marmsoler
d8c8c9413b fix extracting zip on windows 2022-05-29 12:03:05 +02:00
Martin Marmsoler
06ed2bf9ed add windows test 2022-05-29 12:03:04 +02:00
Martin Marmsoler
0c3b9949cc format init_repo.cpp 2022-05-06 10:41:42 +02:00
Martin Marmsoler
494ce51854 Diff.moc not needed because not Q_OBJECT is in the class 2022-05-06 09:41:35 +02:00
Martin Marmsoler
9f96c9f4d7 use TEST_MAIN instead of QTEST_MAIN, so the ubuntu install requirements are not needed anymore 2022-05-06 09:16:21 +02:00
Martin Marmsoler
2b0900def3 fix index tests 2022-05-05 23:11:21 +02:00
Martin Marmsoler
cde4e7d10f use platform offscreen to get rid of the failure: qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found. 2022-05-05 22:55:36 +02:00
Martin Marmsoler
be570fe396 cleanup 2022-05-05 22:35:21 +02:00
Martin Marmsoler
ca2049e0f4 replace remote online repository by an offline one, because the Github CI does not allow accessing online urls. 2022-05-05 22:33:48 +02:00
Martin Marmsoler
244d84191a add timeout to the wait loops so they don't run for infinite time 2022-05-05 22:32:45 +02:00
Martin Marmsoler
9bd742233e format code 2022-05-01 09:51:34 +02:00
Martin Marmsoler
3142f4f441 make staging functions public, because Windows build fails using this redefinement of the private keyword 2022-04-02 13:50:23 +02:00
Martin Marmsoler
398217a52d remove not needed comments 2022-04-02 13:25:45 +02:00
Martin Marmsoler
f1a5be5071 remove not used testrepository 2022-04-02 12:07:01 +02:00
Martin Marmsoler
8e4bec4120 cleanup 2022-04-02 12:04:39 +02:00
Martin Marmsoler
8fc4e00f65 cleanup 2022-04-02 11:58:16 +02:00
Martin Marmsoler
ac43577167 fix opening the zip archive again for a second test 2022-04-02 11:57:54 +02:00
Martin Marmsoler
a229a1f75f add another test 2022-04-02 10:33:18 +02:00
Martin Marmsoler
687ebf52a8 use index instead of creating a new variable 2022-04-02 08:15:15 +02:00
Martin Marmsoler
4260a4b9a0 use temporary path 2022-04-02 08:09:08 +02:00
Martin Marmsoler
29deb82a9d use content comparsion instead of linenumber comparsion, because if the staged patch contains only additions this will never be matched 2022-04-02 08:07:08 +02:00
Martin Marmsoler
a7ac601f31 add testrepo 2022-03-31 19:29:47 +02:00
Murmele
d52896fa79
Unittest for HunkWidget::setEditorLineInfos (#49)
* fix setSetEditorLines and create unit tests for it

* submodule must be added
2022-02-02 18:53:53 +01:00
Stefan Knotzer
25242600ab Remove DiffWidget and FileList 2021-12-24 11:30:50 +01:00
kas
438f849379 Fix tests
Fix tests by updating expectations to match the new double tree layout
Use an explicit QT plugin path on Windows
Fix a text editor bug: When in read-write mode, keys were not getting passed to Scintilla
2021-11-26 15:25:46 +01:00
Martin Marmsoler
cef6280fb9 Merge commit '9ee074e7eb78b2d42dda21cb0dee31a4fd0b363a' 2021-11-17 14:52:50 +01:00
Martin Marmsoler
1291b04aff remove not needed functions 2021-11-17 14:34:47 +01:00
Martin Marmsoler
5683fa894b Replace GitAhead by Gittyup 2021-10-19 15:05:47 +02:00
Martin Marmsoler
687cfa9d0d Merge commit 'bb747caef098140d9674990b1d79d096d1eac8df'
Conflicts:
	src/git/Repository.cpp
	src/ui/CMakeLists.txt
	src/ui/DetailView.cpp
	src/ui/DiffView.cpp
2021-04-17 20:12:11 +02:00