Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

next into test #722

Merged
merged 52 commits into from
Dec 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift click to select a range
56de6ac
fix(deps): update dependency phpoffice/phpspreadsheet to v1.29.4 [sec…
renovate[bot] Nov 21, 2024
b20e4d9
ZMS-2670 button "wieder aufnehmen" und "wieder aufrufen" nur für Sach…
MoDaae Nov 25, 2024
d00cd04
clean(ZMS-3377): changed labels
msfb3 Nov 25, 2024
1a1cad4
clean(ZMS-3377): changed info label to mins
msfb3 Nov 25, 2024
7f61960
clean(ZMS-3377): fixed unit tests
msfb3 Nov 25, 2024
17004e7
ZMS-3420 Update condition to display main content only when at least …
MoDaae Nov 26, 2024
bd65587
Merge pull request #708 from it-at-m/cleanup-zms-3377-change-labels
msfb3 Nov 26, 2024
ba6a4d5
feat(ZMS-3418) OU in pageheader nicht anzeigen bei mehreren Standorten
MoDaae Nov 27, 2024
a4bf6a0
clean(ZMS-2872): added scope and department to delete message
msfb3 Nov 28, 2024
7c33566
clean(ZMS-3377): added new migration to change default text
msfb3 Nov 29, 2024
428a765
clean(ZMS-2872): fixed unit tests
msfb3 Nov 29, 2024
00d20df
CleanUpdate zmsdb/migrations/91732870750-custom-textfiled-label.sql
msfb3 Nov 29, 2024
8040851
feat(ZMS-3152): show traffic light indicator
manjencic Nov 29, 2024
be55757
Merge branch 'test' into next
Dec 2, 2024
1781bd3
clean(ZMS-2872): added default to varibles and deleted outcommentted…
msfb3 Dec 3, 2024
78fb55f
feat(ZMS-3152): fix tests
manjencic Dec 3, 2024
d660683
feat(ZMS-3152): fix tests
manjencic Dec 3, 2024
0f01038
feat(ZMS-3152): fix tests
manjencic Dec 3, 2024
7fc2b9f
feat(ZMS-3152): fix tests
manjencic Dec 3, 2024
901b4c0
feat(ZMS-3152): fix tests
manjencic Dec 3, 2024
2db93ff
feat(ZMS-3152): fix tests
manjencic Dec 3, 2024
bdd65cc
Revert "Merge pull request #708 from it-at-m/cleanup-zms-3377-change-…
ThomasAFink Dec 4, 2024
3f0a758
Merge branch 'next' into cleanup-zms-3377-change-labels
ThomasAFink Dec 4, 2024
44eff3c
clean(ZMS-3377): revert the revert
ThomasAFink Dec 4, 2024
1be223b
clean(ZMS-3377): revert the revert revert
ThomasAFink Dec 4, 2024
a1c107e
clean(ZMS-3377): change readme to trigger actions
ThomasAFink Dec 4, 2024
e251db1
chore(ZMS-3237): Switch php base image from Berlin to Munich (#704)
ThomasAFink Dec 4, 2024
3f2f690
feat(ZMS-3433): search log by all values in data
manjencic Dec 5, 2024
64a0a69
feat(ZMS-3433): fix tests
manjencic Dec 5, 2024
5d8e2ab
feat(ZMS-3433): fix tests
manjencic Dec 5, 2024
3678a34
feat(ZMS-3433): add more tests
manjencic Dec 5, 2024
6803c8e
feat(ZMS-3433): fix tests
manjencic Dec 5, 2024
0cca260
feat(ZMS-3433): fix tests
manjencic Dec 5, 2024
3db03b1
feat(ZMS-3418) keine Referatsangabe in pageheader.twig
MoDaae Dec 5, 2024
5f4ea41
Merge branch 'test' into next
ThomasAFink Dec 5, 2024
a44763f
feat(ZMS-3418) fix unit test
MoDaae Dec 5, 2024
e2d3c84
clean(ZMS-3377): reserved default label change
msfb3 Dec 5, 2024
b8e6331
Merge pull request #715 from it-at-m/bugfix-zms-2670-wieder-aufrufen-…
MoDaae Dec 6, 2024
e17942b
Merge pull request #713 from it-at-m/feature-zms-3420-kundenservice-g…
MoDaae Dec 6, 2024
8b3caa4
Merge pull request #712 from it-at-m/cleanup-zms-3377-change-labels
msfb3 Dec 6, 2024
16774c5
feat(ZMS-3152): remove unused class
manjencic Dec 6, 2024
bfac3c6
Merge pull request #718 from it-at-m/feature-zms-3418-ekiosk-zwei-sta…
MoDaae Dec 6, 2024
25b8597
feat(ZMS-3401): added new calldisplay layouts (#714)
Fabinatix97 Dec 6, 2024
272b24a
feat(ZMS-3433): fix showing log by id
manjencic Dec 6, 2024
e880f45
fix(deps): update dependency giggsey/libphonenumber-for-php to v8.13.…
renovate[bot] Dec 6, 2024
45b8824
cleanup(TV-47): reduce and improve logging in cronjobs (#719)
ThomasAFink Dec 6, 2024
778513d
Merge pull request #711 from it-at-m/cleanup-zms-2872-expend-delete-m…
msfb3 Dec 6, 2024
3eb5de9
feat(ZMS-3433): fix order
manjencic Dec 9, 2024
9baaedb
feat(ZMS-3433): change parameter name
manjencic Dec 9, 2024
d310c9d
Merge pull request #721 from it-at-m/feature-zms-3433-search-logs-by-…
manjencic Dec 9, 2024
0762917
feat(ZMS-3152): merge next
manjencic Dec 9, 2024
8d4c63d
Merge pull request #717 from it-at-m/feature-zms-3152-traffic-lights-…
manjencic Dec 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(ZMS-3152): fix tests
  • Loading branch information
manjencic committed Dec 3, 2024
commit 901b4c03928bfd25c09159d2f3b5300bd9911440
2 changes: 1 addition & 1 deletion zmsadmin/tests/Zmsadmin/CounterQueueInfoTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 127,7 @@ public function testTodayWithAdditionalInfo()
'selecteddate' => '2016-04-01'
], []);
$this->assertStringContainsString('davon vor nächstem Spontankunden', (string)$response->getBody());
$this->assertStringContainsString('Wartezeit für neue Spontankunden in Stunden', (string)$response->getBody());
$this->assertStringContainsString('Wartezeit für neue Spontankunden', (string)$response->getBody());

$this->assertEquals(200, $response->getStatusCode());
}
Expand Down
Loading