Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into issue-1096-firefox…
Browse files Browse the repository at this point in the history
…-support
  • Loading branch information
kuceb committed Jan 31, 2020
2 parents 72989be + 1edac1b commit 9e2da3f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
4 changes: 2 additions & 2 deletions packages/reporter/src/header/stats.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React from 'react'
import { StatsStore } from './stats-store'

const count = (num: number) => num > 0 ? num : '--'
const formatDuration = (duration: number) => duration > 0 ? (duration / 1000).toFixed(2) : '0'
const formatDuration = (duration: number) => duration ? String((duration / 1000).toFixed(2)).padStart(5, '0') : '--'

interface Props {
stats: StatsStore
Expand All @@ -28,7 +28,7 @@ const Stats = observer(({ stats }: Props) => (
<span className='num'>{count(stats.numPending)}</span>
</li>
<li className='duration'>
<span className='num'>{count(parseFloat(formatDuration(stats.duration)))}</span>
<span className='num'>{formatDuration(stats.duration)}</span>
</li>
</ul>
))
Expand Down
1 change: 1 addition & 0 deletions packages/server/lib/modes/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,7 @@ const getVideoRecordingDelay = function (startedVideoCapture) {
const maybeStartVideoRecording = Promise.method(function (options = {}) {
const { spec, browser, video, videosFolder } = options

debug(`video recording has been ${video ? 'enabled' : 'disabled'}. video: %s`, video)
// bail if we've been told not to capture
// a video recording
if (!video) {
Expand Down

1 comment on commit 9e2da3f

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 9e2da3f Jan 31, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux x64 version of the Test Runner.

You can install this pre-release platform-specific build using instructions at https://on.cypress.io/installing-cypress#Install-pre-release-version.

You will need to use custom CYPRESS_INSTALL_BINARY url and install Cypress using an url instead of the version.

export CYPRESS_INSTALL_BINARY=https://cdn.cypress.io/beta/binary/3.8.4/linux-x64/circle-issue-1096-firefox-support-9e2da3f0edc77e611d8755b2c98ba7d62fb05cdb-240705/cypress.zip
npm install https://cdn.cypress.io/beta/npm/3.8.4/circle-issue-1096-firefox-support-9e2da3f0edc77e611d8755b2c98ba7d62fb05cdb-240692/cypress.tgz

Please sign in to comment.