Fixes unit tests2

app/common/lib/tabContentUtil.js

@@ -0,0 +1,31 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const locale = require('../../../js/l10n')
+const frameStateUtil = require('../../../js/state/frameStateUtil.js')
+
+module.exports.iconSize = 16
+
+module.exports.getDisplayTitle = (state, frameKey) => {
+  const frame = frameStateUtil.getFrameByKey(state, frameKey)
+
+  if (!frame) {
+    return ''
+  }
+
+  // For renderer initiated navigation, make sure we show Untitled
+  // until we know what we're loading.  We should probably do this for
+  // all about: pages that we already know the title for so we don't have
+  // to wait for the title to be parsed.
+  if (frame.get('location') === 'about:blank') {
+    return locale.translation('aboutBlankTitle')
+  } else if (frame.get('location') === 'about:newtab') {
+    return locale.translation('newTab')
+  }
+
+  // YouTube tries to change the title to add a play icon when
+  // there is audio. Since we have our own audio indicator we get
+  // rid of it.
+  return (frame.get('title') || frame.get('location') || '').replace('▶ ', '')
+}

app/renderer/components/bookmarks/bookmarkToolbarButton.js

@@ -25,7 +25,7 @@ const dragTypes = require('../../../../js/constants/dragTypes')
 const siteUtil = require('../../../../js/state/siteUtil')
 const {getCurrentWindowId} = require('../../currentWindow')
 const dnd = require('../../../../js/dnd')
-const iconSize = require('../../../common/lib/faviconUtil').iconSize
+const iconSize = require('../../../common/lib/tabContentUtil').iconSize
 const cx = require('../../../../js/lib/classSet')
 
 // Styles

app/renderer/components/bookmarks/bookmarksToolbar.js

@@ -30,7 +30,7 @@ const cx = require('../../../../js/lib/classSet')
 const dnd = require('../../../../js/dnd')
 const dndData = require('../../../../js/dndData')
 const calculateTextWidth = require('../../../../js/lib/textCalculator').calculateTextWidth
-const iconSize = require('../../../common/lib/faviconUtil').iconSize
+const iconSize = require('../../../common/lib/tabContentUtil').iconSize
 
 // Styles
 const globalStyles = require('../styles/global')

app/renderer/components/tabs/content/closeTabIcon.js

@@ -66,8 +66,8 @@ class CloseTabIcon extends React.Component {
 
   render () {
     return <TabIcon
-      ref={(node) => { this.iconNode = node }}
       data-test-id='closeTabIcon'
+      data-test2-id={this.props.showCloseIcon ? 'close-icon-on' : 'close-icon-off'}
       className={css(this.props.showCloseIcon && styles.closeTab)}
       l10nId='closeTabButton'
       onClick={this.onClick}

app/renderer/components/tabs/content/tabIcon.js

@@ -42,6 +42,7 @@ class TabIcon extends ImmutableComponent {
               [css(styles.icon)]: true
             })}
             data-test-id={this.props['data-test-id']}
+            data-test2-id={this.props['data-test2-id']}
             data-l10n-id={this.props.l10nId}
             data-l10n-args={JSON.stringify(this.props.l10nArgs || {})}
           >{this.props.symbolContent}</span>

app/renderer/components/tabs/content/tabTitle.js

@@ -14,6 +14,7 @@ const frameStateUtil = require('../../../../../js/state/frameStateUtil')
 
 // Styles
 const globalStyles = require('../../styles/global')
+const tabContentUtil = require('../../../../common/lib/tabContentUtil.js')
 
 class TabTitle extends React.Component {
   mergeProps (state, dispatchProps, ownProps) {
@@ -24,7 +25,7 @@ class TabTitle extends React.Component {
     // used in renderer
     props.enforceFontVisibilty = isDarwin() && tabIconColor === 'white'
     props.tabIconColor = tabIconColor
-    props.displayTitle = frameStateUtil.getDisplayTitle(currentWindow, ownProps.frameKey)
+    props.displayTitle = tabContentUtil.getDisplayTitle(currentWindow, ownProps.frameKey)
 
     // used in functions
     props.frameKey = ownProps.frameKey

app/renderer/components/tabs/tab.js

@@ -259,7 +259,6 @@ class Tab extends React.Component {
     props.isNarrowestView = frameStateUtil.isNarrowestView(currentWindow, props.frameKey)
     props.isPlayIndicatorBreakpoint = frameStateUtil.isMediumView(currentWindow, props.frameKey) || props.isNarrowView
     props.title = frame.get('title')
-    props.displayTitle = frameStateUtil.getDisplayTitle(currentWindow, props.frameKey)
     props.showSessionIcon = partition && hasSeconardImage
     props.showPrivateIcon = props.isPrivateTab && hasSeconardImage
     props.showFavIcon = !((hasBreakpoint(breakpoint, 'extraSmall') && props.isActive) || frame.get('location') === 'about:newtab')

app/renderer/components/tabs/tabs.js

@@ -148,6 +148,7 @@ class Tabs extends React.Component {
 
     // used in other functions
     props.tabPageIndex = currentWindow.getIn(['ui', 'tabs', 'tabPageIndex'])
+    props.dragData = state.getIn(['dragData', 'type']) === dragTypes.TAB && state.get('dragData')
     props.totalPages = totalPages
 
     return props

app/renderer/lib/tabUtil.js

@@ -6,7 +6,7 @@ const styles = require('../components/styles/global')
 
 /**
  * Get tab's breakpoint name for current tab size.
- * @param {Number} The current tab size
+ * @param {Number} tabWidth current tab size
  * @returns {String} The matching breakpoint.
  */
 module.exports.getTabBreakpoint = (tabWidth) => {
@@ -28,7 +28,7 @@ module.exports.tabUpdateFrameRate = 66
 
 /**
  * Check whether or not current breakpoint match defined criteria
- * @param {Object} props - Object that hosts the tab breakpoint
+ * @param {Object} breakpoint - Brake point value
  * @param {Array} arr - Array of Strings including breakpoint names to check against
  * @returns {Boolean} Whether or not the sizing criteria was match
  */

js/about/bookmarks.js

@@ -15,7 +15,7 @@ const cx = require('../lib/classSet')
 const SortableTable = require('../../app/renderer/components/common/sortableTable')
 const siteUtil = require('../state/siteUtil')
 const formatUtil = require('../../app/common/lib/formatUtil')
-const iconSize = require('../../app/common/lib/faviconUtil').iconSize
+const iconSize = require('../../app/common/lib/tabContentUtil').iconSize
 
 const ipc = window.chrome.ipcRenderer
 

js/state/frameStateUtil.js

@@ -21,7 +21,6 @@ const {makeImmutable} = require('../../app/common/state/immutableUtil')
 const {getSetting} = require('../settings')
 const {isIntermediateAboutPage} = require('../lib/appUrlUtil')
 const urlParse = require('../../app/common/urlParse')
-const locale = require('../l10n')
 const {getTextColorForBackground} = require('../lib/color')
 const {hasBreakpoint} = require('../../app/renderer/lib/tabUtil')
 
@@ -571,29 +570,6 @@ function isNarrowestView (state, frameKey) {
   return sizes.includes(frame.get('breakpoint'))
 }
 
-function getDisplayTitle (state, frameKey) {
-  const frame = getFrameByKey(state, frameKey)
-
-  if (!frame) {
-    return ''
-  }
-
-  // For renderer initiated navigation, make sure we show Untitled
-  // until we know what we're loading.  We should probably do this for
-  // all about: pages that we already know the title for so we don't have
-  // to wait for the title to be parsed.
-  if (frame.get('location') === 'about:blank') {
-    return locale.translation('aboutBlankTitle')
-  } else if (frame.get('location') === 'about:newtab') {
-    return locale.translation('newTab')
-  }
-
-  // YouTube tries to change the title to add a play icon when
-  // there is audio. Since we have our own audio indicator we get
-  // rid of it.
-  return (frame.get('title') || frame.get('location') || '').replace('▶ ', '')
-}
-
 function getTabIconColor (state, frameKey) {
   const frame = getFrameByKey(state, frameKey)
   const isActive = isFrameKeyActive(state, frameKey)
@@ -622,10 +598,9 @@ function hasFixedCloseIcon (state, frameKey) {
 
   return (
     isActive &&
-    // larger sizes still have a relative closeIcon
-    !hasBreakpoint(frame.get('breakpoint'), ['default', 'large']) &&
-    // We don't resize closeIcon as we do with favicon so don't show it
-    !hasBreakpoint(frame.get('breakpoint'), 'smallest')
+    // Larger sizes still have a relative closeIcon
+    // We don't resize closeIcon as we do with favicon so don't show it (smallest)
+    !hasBreakpoint(frame.get('breakpoint'), ['default', 'large', 'smallest'])
   )
 }
 
@@ -791,7 +766,6 @@ module.exports = {
   hasRelativeCloseIcon,
   hasFixedCloseIcon,
   getTabIconColor,
-  getDisplayTitle,
   isNarrowestView,
   isNarrowView,
   isMediumView,

test/unit/app/common/lib/tabContentUtilTest.js

@@ -0,0 +1,95 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/* global describe, it, before, after */
+
+const assert = require('assert')
+const Immutable = require('immutable')
+const mockery = require('mockery')
+const fakeElectron = require('../../../lib/fakeElectron')
+
+const frameKey = 1
+const defaultWindowStore = Immutable.fromJS({
+  activeFrameKey: frameKey,
+  frames: [{
+    key: frameKey,
+    tabId: 1,
+    location: 'http://brave.com'
+  }],
+  tabs: [{
+    key: frameKey
+  }],
+  framesInternal: {
+    index: {
+      1: 0
+    },
+    tabIndex: {
+      1: 0
+    }
+  }
+})
+
+describe('tabContentUtil unit tests', function () {
+  let tabContentUtil
+
+  before(function () {
+    mockery.enable({
+      warnOnReplace: false,
+      warnOnUnregistered: false,
+      useCleanCache: true
+    })
+    mockery.registerMock('electron', fakeElectron)
+    mockery.registerMock('../../../js/l10n', {
+      translation: () => 'translated'
+    })
+    tabContentUtil = require('../../../../../app/common/lib/tabContentUtil')
+  })
+
+  after(function () {
+    mockery.disable()
+  })
+
+  it('should return empty string if frame is not found', function * () {
+    const result = tabContentUtil.getDisplayTitle(defaultWindowStore, 0)
+    assert.equal(result, '')
+  })
+
+  it('should return translated title for about:blank', function * () {
+    const windowStore = defaultWindowStore.mergeIn(['frames', 0], {
+      location: 'about:blank'
+    })
+    const result = tabContentUtil.getDisplayTitle(windowStore, frameKey)
+    assert.equal(result, 'translated')
+  })
+
+  it('should return translated title for about:newtab', function * () {
+    const windowStore = defaultWindowStore.mergeIn(['frames', 0], {
+      location: 'about:blank'
+    })
+    const result = tabContentUtil.getDisplayTitle(windowStore, frameKey)
+    assert.equal(result, 'translated')
+  })
+
+  it('should return title', function * () {
+    const title = 'Brave'
+    const windowStore = defaultWindowStore.mergeIn(['frames', 0], {
+      title: title
+    })
+    const result = tabContentUtil.getDisplayTitle(windowStore, frameKey)
+    assert.equal(result, title)
+  })
+
+  it('should return location if title is not provided', function * () {
+    const result = tabContentUtil.getDisplayTitle(defaultWindowStore, frameKey)
+    assert.equal(result, defaultWindowStore.getIn(['frames', 0, 'location']))
+  })
+
+  it('should replace play indicator from the title (added by Youtube)', function * () {
+    const windowStore = defaultWindowStore.mergeIn(['frames', 0], {
+      title: '▶ Brave'
+    })
+    const result = tabContentUtil.getDisplayTitle(windowStore, frameKey)
+    assert.equal(result, 'Brave')
+  })
+})

test/unit/app/renderer/components/navigation/navigatorTest.js

@@ -95,7 +95,7 @@ describe('Navigator component unit tests', function () {
   })
 
   after(function () {
-    mockery.disable()
+    mockery.deregisterAll()
   })
 
   describe('when user has history going forwards and backwards', function () {