Merge branch 'develop' into fix-rerun-hooks-on-navigation

Author: jennifer-shehane

circle.yml

@@ -8,7 +8,7 @@ macBuildFilters: &macBuildFilters
     branches:
       only:
         - develop
-        - try-new-electron-sign
+        - investigate-spec-on-mac
 
 defaults: &defaults
   parallelism: 1
@@ -325,6 +325,17 @@ jobs:
           command: yarn type-check --ignore-progress
       - store-npm-logs
 
+  build-system-unit-tests:
+    <<: *defaults
+    parallelism: 1
+    steps:
+      - attach_workspace:
+          at: ~/
+      # make sure mocha runs
+      - run: yarn test-mocha
+      # test binary build code
+      - run: yarn test-scripts
+
   "server-unit-tests":
     <<: *defaults
     parallelism: 2
@@ -1166,6 +1177,9 @@ linux-workflow: &linux-workflow
     - cli-visual-tests:
         requires:
           - build
+    - build-system-unit-tests:
+        requires:
+          - build
     - unit-tests:
         requires:
           - build
@@ -1403,7 +1417,14 @@ mac-workflow: &mac-workflow
         requires:
           - Mac build
 
-    # maybe run unit tests?
+    - build-system-unit-tests:
+        name: Mac build system unit tests
+        executor: mac
+        requires:
+          - Mac build
+        <<: *macBuildFilters
+
+    # maybe run all unit tests?
 
     - build-npm-package:
         name: Mac NPM package

packages/desktop-gui/cypress/integration/update_banner_spec.js

@@ -115,7 +115,8 @@ describe('Update Banner', function () {
     it('modal has info about updating package.json', function () {
       cy.get('.modal').contains(`npm install --save-dev cypress@${NEW_VERSION}`)
 
-      cy.get('.modal').contains(`yarn add cypress@${NEW_VERSION}`)
+      cy.get('.modal').contains(`yarn upgrade cypress@${NEW_VERSION}`)
+      cy.percySnapshot()
     })
 
     it('links to \'open\' doc on click of open command', function () {

packages/desktop-gui/package.json

@@ -41,7 +41,7 @@
     "react-dom": "16.12.0",
     "react-inspector": "4.0.0",
     "react-loader": "2.4.7",
-    "react-select": "3.0.8",
+    "react-select": "3.1.0",
     "webpack": "4.35.3",
     "webpack-cli": "3.3.2"
   },

packages/desktop-gui/src/update/update-banner.jsx

@@ -86,8 +86,7 @@ class UpdateBanner extends Component {
         <li>
           <span>If using npm, run <code>npm install --save-dev cypress@{appStore.newVersion}</code></span>
           <br/>
-          <span>If using yarn, run <code>yarn add cypress@{appStore.newVersion}</code></span>
-
+          <span>If using yarn, run <code>yarn upgrade cypress@{appStore.newVersion}</code></span>
         </li>
         <li>
           <span>Run <a href='#' onClick={this._openCyOpenDoc}><code>node_modules/.bin/cypress open</code></a> to open the new version.</span>