Fix tests

RocketChat · Sep 26, 2024 · 26ebd54 · 26ebd54
1 parent f681fce
commit 26ebd54
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 25 deletions.
diff --git a/apps/meteor/client/sidebar/sections/BannerSection.spec.tsx b/apps/meteor/client/sidebar/sections/BannerSection.spec.tsx
@@ -21,10 +21,7 @@ describe('Sidebar -> BannerSection -> Airgapped restriction', () => {
 	it('Should render null if admin and not restricted or warning', () => {
 		render(<BannerSection />, {
 			legacyRoot: true,
-			wrapper: mockAppRoot()
-				.withJohnDoe({ roles: ['user'] })
-				.withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 8)
-				.build(),
+			wrapper: mockAppRoot().withJohnDoe().withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 8).build(),
 		});
 
 		expect(screen.queryByText('air-gapped', { exact: false })).not.toBeInTheDocument();
@@ -34,36 +31,39 @@ describe('Sidebar -> BannerSection -> Airgapped restriction', () => {
 		render(<BannerSection />, {
 			legacyRoot: true,
 			wrapper: mockAppRoot()
-				.withJohnDoe({ roles: ['user'] })
+				.withJohnDoe()
+				.withRole('admin')
 				.withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 7)
 				.build(),
 		});
 
-		expect(screen.queryByText('will enter read-only', { exact: false })).not.toBeInTheDocument();
+		expect(screen.getByText('will enter read-only', { exact: false })).toBeInTheDocument();
 	});
 
 	it('Should render restriction message if admin and restricted phase', () => {
 		render(<BannerSection />, {
 			legacyRoot: true,
 			wrapper: mockAppRoot()
-				.withJohnDoe({ roles: ['user'] })
-				.withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 7)
+				.withJohnDoe()
+				.withRole('admin')
+				.withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 0)
 				.build(),
 		});
 
-		expect(screen.queryByText('is in read-only', { exact: false })).not.toBeInTheDocument();
+		expect(screen.getByText('is in read-only', { exact: false })).toBeInTheDocument();
 	});
 
 	it('Should render restriction message instead of another banner', () => {
 		render(<BannerSection />, {
 			legacyRoot: true,
 			wrapper: mockAppRoot()
-				.withJohnDoe({ roles: ['user'] })
-				.withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 7)
+				.withJohnDoe()
+				.withRole('admin')
+				.withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 0)
 				.withSetting('Presence_broadcast_disabled', true)
 				.build(),
 		});
 
-		expect(screen.queryByText('is in read-only', { exact: false })).not.toBeInTheDocument();
+		expect(screen.getByText('is in read-only', { exact: false })).toBeInTheDocument();
 	});
 });
diff --git a/apps/meteor/client/sidebarv2/sections/BannerSection.spec.tsx b/apps/meteor/client/sidebarv2/sections/BannerSection.spec.tsx
@@ -21,10 +21,7 @@ describe('Sidebar -> BannerSection -> Airgapped restriction', () => {
 	it('Should render null if admin and not restricted or warning', () => {
 		render(<BannerSection />, {
 			legacyRoot: true,
-			wrapper: mockAppRoot()
-				.withJohnDoe({ roles: ['user'] })
-				.withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 8)
-				.build(),
+			wrapper: mockAppRoot().withJohnDoe().withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 8).build(),
 		});
 
 		expect(screen.queryByText('air-gapped', { exact: false })).not.toBeInTheDocument();
@@ -34,36 +31,39 @@ describe('Sidebar -> BannerSection -> Airgapped restriction', () => {
 		render(<BannerSection />, {
 			legacyRoot: true,
 			wrapper: mockAppRoot()
-				.withJohnDoe({ roles: ['user'] })
+				.withJohnDoe()
+				.withRole('admin')
 				.withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 7)
 				.build(),
 		});
 
-		expect(screen.queryByText('will enter read-only', { exact: false })).not.toBeInTheDocument();
+		expect(screen.getByText('will enter read-only', { exact: false })).toBeInTheDocument();
 	});
 
 	it('Should render restriction message if admin and restricted phase', () => {
 		render(<BannerSection />, {
 			legacyRoot: true,
 			wrapper: mockAppRoot()
-				.withJohnDoe({ roles: ['user'] })
-				.withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 7)
+				.withJohnDoe()
+				.withRole('admin')
+				.withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 0)
 				.build(),
 		});
 
-		expect(screen.queryByText('is in read-only', { exact: false })).not.toBeInTheDocument();
+		expect(screen.getByText('is in read-only', { exact: false })).toBeInTheDocument();
 	});
 
 	it('Should render restriction message instead of another banner', () => {
 		render(<BannerSection />, {
 			legacyRoot: true,
 			wrapper: mockAppRoot()
-				.withJohnDoe({ roles: ['user'] })
-				.withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 7)
+				.withJohnDoe()
+				.withRole('admin')
+				.withSetting('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', 0)
 				.withSetting('Presence_broadcast_disabled', true)
 				.build(),
 		});
 
-		expect(screen.queryByText('is in read-only', { exact: false })).not.toBeInTheDocument();
+		expect(screen.getByText('is in read-only', { exact: false })).toBeInTheDocument();
 	});
 });
diff --git a/apps/meteor/client/views/room/composer/ComposerContainer.tsx b/apps/meteor/client/views/room/composer/ComposerContainer.tsx
@@ -21,7 +21,6 @@ import { useMessageComposerIsArchived } from './hooks/useMessageComposerIsArchiv
 import { useMessageComposerIsBlocked } from './hooks/useMessageComposerIsBlocked';
 import { useMessageComposerIsReadOnly } from './hooks/useMessageComposerIsReadOnly';
 
-// TODO unit test this
 const ComposerContainer = ({ children, ...props }: ComposerMessageProps): ReactElement => {
 	const room = useRoom();