Fix announcements store test

dotCMS · Jan 26, 2024 · 7650bb6 · 7650bb6
1 parent 7c2a0f4
commit 7650bb6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/...ts/dot-toolbar/components/dot-toolbar-announcements/store/dot-announcements.store.spec.ts b/...ts/dot-toolbar/components/dot-toolbar-announcements/store/dot-announcements.store.spec.ts
@@ -56,9 +56,8 @@ describe('AnnouncementsStore', () => {
 
     it('should not mark announcements as unread when there are no new announcements', (done) => {
         localStorage.removeItem('dotAnnouncementsData');
-
-        spectator.service.markAnnouncementsAsRead();
         spectator.service.loadAnnouncements();
+        spectator.service.markAnnouncementsAsRead();
 
         spectator.service.state$.subscribe((state) => {
             expect(state.showUnreadAnnouncement).toBe(false);
@@ -70,7 +69,6 @@ describe('AnnouncementsStore', () => {
         localStorage.removeItem('dotAnnouncementsData');
 
         spectator.service.loadAnnouncements();
-
         spectator.service.state$.subscribe((state) => {
             expect(state.showUnreadAnnouncement).toBe(true);
             done();

diff --git a/...ponents/dot-toolbar/components/dot-toolbar-announcements/store/dot-announcements.store.ts b/...ponents/dot-toolbar/components/dot-toolbar-announcements/store/dot-announcements.store.ts
@@ -41,25 +41,26 @@ export class AnnouncementsStore extends ComponentStore<DotAnnouncementsState> {
         });
     }
 
-    readonly loadAnnouncements = this.effect(() => {
-        return this.http.get<Announcement[]>(this.announcementsUrl).pipe(
-            pluck('entity'),
-            tap((announcements: Announcement[]) => {
-                const modifiedAnnouncements = announcements.map((announcement) => {
-                    return {
-                        ...announcement,
-                        url: `${announcement.url}?utm_source=dotcms&utm_medium=application&utm_campaign=announcement_menu`
-                    };
-                });
-
-                this.setState({
-                    announcements: modifiedAnnouncements,
-                    showUnreadAnnouncement: this.hasUnreadAnnouncements(announcements)
-                });
-            }),
-            catchError(() => EMPTY)
-        );
-    });
+    readonly loadAnnouncements = () =>
+        this.effect(() => {
+            return this.http.get<Announcement[]>(this.announcementsUrl).pipe(
+                pluck('entity'),
+                tap((announcements: Announcement[]) => {
+                    const modifiedAnnouncements = announcements.map((announcement) => {
+                        return {
+                            ...announcement,
+                            url: `${announcement.url}?utm_source=dotcms&utm_medium=application&utm_campaign=announcement_menu`
+                        };
+                    });
+
+                    this.setState({
+                        announcements: modifiedAnnouncements,
+                        showUnreadAnnouncement: this.hasUnreadAnnouncements(announcements)
+                    });
+                }),
+                catchError(() => EMPTY)
+            );
+        });
 
     readonly announcementsSignal: Signal<Announcement[]> = this.selectSignal(
         (state) => state.announcements