fix RootContainer test

hexlet-codebattle · Jan 11, 2021 · f0d00d0 · f0d00d0
1 parent 037281b
commit f0d00d0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/services/app/assets/js/__tests__/RootContainer.test.jsx b/services/app/assets/js/__tests__/RootContainer.test.jsx
@@ -71,5 +71,5 @@ test('test rendering active game components', async () => {
   render(<Provider store={store}><RootContainer /></Provider>);
 
   expect(screen.getByText(/Online users:/)).toBeInTheDocument();
-  expect(screen.getByText(/Task/)).toBeInTheDocument();
+  expect(screen.getByText(/^(Task)$/)).toBeInTheDocument();
 });
diff --git a/services/app/assets/js/widgets/containers/GameWidget.jsx b/services/app/assets/js/widgets/containers/GameWidget.jsx
@@ -16,14 +16,14 @@ import Output from '../components/ExecutionOutput/Output';
 const RightSide = ({ output, children }) => {
   const [showTab, setShowTab] = useState('editor');
   const over = showTab === 'editor' ? '' : 'overflow-auto';
+  const isShowOutput = output && output.status;
   return (
     <>
       <div className={`flex-grow-1 ${over}`} id="editor">
-
         {showTab === 'editor' ? <div className="h-100">{children}</div>
         : (
           <div className="h-auto">
-            <Output sideOutput={output} />
+            {isShowOutput && <Output sideOutput={output} />}
           </div>
 )}
 
@@ -54,7 +54,7 @@ const RightSide = ({ output, children }) => {
               setShowTab('output');
             }}
           >
-            <OutputTab sideOutput={output} side="right" />
+            {isShowOutput && <OutputTab sideOutput={output} side="right" />}
           </a>
         </div>
       </nav>

diff --git a/services/app/assets/js/widgets/containers/InfoWidget.jsx b/services/app/assets/js/widgets/containers/InfoWidget.jsx
@@ -12,6 +12,7 @@ const InfoWidget = () => {
   const timeoutSeconds = useSelector(state => gameStatusSelector(state).timeoutSeconds);
   const gameStatusName = useSelector(state => gameStatusSelector(state).status);
   const leftOutput = useSelector(state => leftExecutionOutputSelector(state));
+  const isShowOutput = leftOutput && leftOutput.status;
   const idOutput = 'leftOutput';
   return (
     <>
@@ -39,7 +40,7 @@ const InfoWidget = () => {
                 aria-controls={`${idOutput}`}
                 aria-selected="false"
               >
-                <OutputTab sideOutput={leftOutput} side="left" />
+                {isShowOutput && <OutputTab sideOutput={leftOutput} side="left" />}
               </a>
             </div>
           </nav>
@@ -63,7 +64,7 @@ const InfoWidget = () => {
               role="tabpanel"
               aria-labelledby={`${idOutput}-tab`}
             >
-              <Output sideOutput={leftOutput} />
+              {isShowOutput && <Output sideOutput={leftOutput} />}
             </div>
 
           </div>