Prevent singlePlayer from returning null when forcing via config

Fixes cookpete/react-player#500
albanqoku · Nov 17, 2018 · 862fa2a · 862fa2a
1 parent f9579cb
commit 862fa2a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/singlePlayer.js b/src/singlePlayer.js
@@ -44,7 +44,9 @@ export default function createSinglePlayer (activePlayer) {
       this.player = player
     }
     render () {
-      if (!activePlayer.canPlay(this.props.url)) {
+      const { forceVideo, forceAudio, forceHLS, forceDASH } = this.config.file
+      const skipCanPlay = forceVideo || forceAudio || forceHLS || forceDASH
+      if (!activePlayer.canPlay(this.props.url) && !skipCanPlay) {
         return null
       }
       const { style, width, height, wrapper: Wrapper } = this.props

diff --git a/test/singlePlayer.js b/test/singlePlayer.js
@@ -78,3 +78,21 @@ test('render', t => {
     <Player activePlayer={FilePlayer} />
   ))
 })
+
+test('render - null', t => {
+  const wrapper = shallow(<SinglePlayer url='http://example.com/not-a-file-path' />)
+  t.true(wrapper.type() === null)
+})
+
+test('render - force via config', t => {
+  const wrapper = shallow(<SinglePlayer url='http://example.com/not-a-file-path' config={{ file: { forceVideo: true } }} />)
+  const player = wrapper.childAt(0)
+  t.true(player.is(Player))
+  t.true(player.prop('activePlayer') === FilePlayer)
+  t.true(player.prop('url') === 'http://example.com/not-a-file-path')
+
+  // This fails, but I don't know why
+  // t.true(wrapper.childAt(0).matchesElement(
+  //   <Player activePlayer={FilePlayer} />
+  // ))
+})