chore: Fix cypress binary cache

box · Jan 4, 2019 · b209ee0 · b209ee0
1 parent ec3fac7
commit b209ee0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,8 +13,8 @@ npm-debug.log
 npm-error.log
 reports
 styleguide
-test/cypress/screenshots
-test/cypress/videos
+test/screenshots
+test/videos
 test/dev.html
 yarn-debug.log
 yarn-error.log
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ cache:
   yarn: true
   directories:
     - node_modules
+    - ~/.cache/Cypress
 jobs:
   include:
     - name: "Commit Lint"
@@ -15,5 +16,7 @@ jobs:
       script: yarn flow
     - name: "Tests"
       script: yarn test; yarn test:e2e
-    - name: "Build"
-      script: npm-run-all clean build:i18n build:ci:es build:ci:dist
+    - name: "Build Babel"
+      script: npm-run-all clean build:i18n build:ci:es
+    - name: "Build Webpack"
+      script: npm-run-all clean build:i18n build:ci:dist
diff --git a/package.json b/package.json
@@ -50,8 +50,8 @@
         "build:prod:npm": "BABEL_ENV=production OUTPUT=dist LANGUAGE=en-US REACT=true yarn build:prod:dist",
         "clean": "rm -rf dist lib i18n/json i18n/*.js reports styleguide",
         "copy:styles": "cpx './src/**/*.scss' lib",
-        "cy:open": "yarn cy:wait; cypress open",
-        "cy:run": "yarn cy:wait; cypress run --spec test/integration/**/*.test.js",
+        "cy:open": "yarn cy:wait; yarn cypress open",
+        "cy:run": "yarn cy:wait; yarn cypress run --spec test/integration/**/*.test.js",
         "cy:wait": "wait-on tcp:6060",
         "lint": "npm-run-all lint:*",
         "lint:js": "eslint --max-warnings=0 .",

diff --git a/test/integration/content-explorer/ContentExplorer.test.js b/test/integration/content-explorer/ContentExplorer.test.js
@@ -21,10 +21,9 @@ describe('ContentExplorer', () => {
             cy.queryByTestId('bcs-content').should('exist');
         });
 
-        // TODO: Remove exclusion once sidebar closed state bug is resolved
-        it.skip('Navigation within a collection keeps sidebar closed', () => {
+        it('Navigation within a collection keeps sidebar closed', () => {
             // Manually closing the sidebar should remove its content
-            cy.queryByTestId('activitysidebar').click();
+            cy.queryByTestId('sidebaractivity').click();
             cy.queryByTestId('bcs-content').should('not.exist');
 
             // Navigating between files in a collection should retain the prior closed state