refactor(ZNTA-1865): Return undefined rather than empty spans

Refactor tests to work with components returning undefined
zanata · Jul 19, 2017 · 3f755f2 · 3f755f2
1 parent ffba21c
commit 3f755f2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 11 deletions.
diff --git a/...rontend/src/frontend/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js b/...rontend/src/frontend/app/components/DraggableVersionPanels/DraggableVersionPanels.test.js
@@ -83,9 +83,6 @@ describe('DraggableVersionPanels', () => {
         onDraggableMoveEnd={callback}
         removeVersion={callback} />
     )
-    const expected = ReactDOMServer.renderToStaticMarkup(
-      <span></span>
-    )
-    expect(actual).toEqual(expected)
+    expect(actual).toEqual('')
   })
 })
diff --git a/server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/index.js b/server/zanata-frontend/src/frontend/app/components/DraggableVersionPanels/index.js
@@ -90,7 +90,7 @@ class DraggableVersionPanels extends Component {
   }
   render () {
     if (this.props.selectedVersions.length === 0) {
-      return <span></span>
+      return null
     }
     return (
       <ListGroup>

diff --git a/server/zanata-frontend/src/frontend/app/components/LockIcon/LockIcon.test.js b/server/zanata-frontend/src/frontend/app/components/LockIcon/LockIcon.test.js
@@ -20,9 +20,6 @@ describe('LockIcon', () => {
     const actual = ReactDOMServer.renderToStaticMarkup(
       <LockIcon status={'ACTIVE'} />
     )
-    const expected = ReactDOMServer.renderToStaticMarkup(
-      <span></span>
-    )
-    expect(actual).toEqual(expected)
+    expect(actual).toEqual('')
   })
 })
diff --git a/server/zanata-frontend/src/frontend/app/components/LockIcon/index.js b/server/zanata-frontend/src/frontend/app/components/LockIcon/index.js
@@ -18,7 +18,7 @@ const LockIcon = ({status}) => {
       <Icon name='locked' className='s0 icon-locked' />
     </OverlayTrigger>
   )
-  : <span />
+  : null
 }
 LockIcon.propTypes = {
   status: entityStatusPropType

diff --git a/server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js b/server/zanata-frontend/src/frontend/app/containers/ProjectVersion/TMMergeModal.js
@@ -437,7 +437,7 @@ class TMMergeModal extends Component {
         />
         )
     const modalFooter = processStatus
-    ? <span></span>
+    ? undefined
     : (
       <span>
         <Row>