Use cypress to build app

skjnldsv · skjnldsv · commit f717ad192501 · 2020-09-02T13:22:33.000+02:00
Signed-off-by: John Molakvoæ (skjnldsv) &lt;skjnldsv@protonmail.com&gt;
diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
@@ -40,11 +40,6 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
 
-      - name: Install dependencies & build app
-        run: |
-          npm ci
-          TESTING=true npm run build --if-present
-
       - name: Wait for server
         run: |
             npm install -g wait-on
@@ -60,13 +55,15 @@ jobs:
         with:
           record: true
           parallel: true
+          build: npm run build
           # cypress env
           ci-build-id: ${{ github.sha }}-${{ github.run_number }}
           tag: ${{ github.event_name }}
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           # https://github.com/cypress-io/github-action/issues/124
           COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
+          TESTING: true
 
       - name: Upload snapshots
         uses: actions/upload-artifact@v2
diff --git a/cypress/integration/files-shares.spec.js b/cypress/integration/files-shares.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/cypress/integration/files.spec.js b/cypress/integration/files.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 
 describe('Files default view', function() {
 	before(function() {
diff --git a/cypress/integration/image-small.png.spec.js b/cypress/integration/image-small.png.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/cypress/integration/image.gif.spec.js b/cypress/integration/image.gif.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/cypress/integration/image.png.spec.js b/cypress/integration/image.png.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/cypress/integration/image.svg.spec.js b/cypress/integration/image.svg.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/cypress/integration/images-custom-list-loadmore.spec.js b/cypress/integration/images-custom-list-loadmore.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/cypress/integration/images-custom-list.spec.js b/cypress/integration/images-custom-list.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/cypress/integration/images.spec.js b/cypress/integration/images.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/cypress/integration/sidebar.spec.js b/cypress/integration/sidebar.spec.js
@@ -21,8 +21,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/cypress/integration/video.mkv.spec.js b/cypress/integration/video.mkv.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/cypress/integration/video.mp4.spec.js b/cypress/integration/video.mp4.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/cypress/integration/video.ogv.spec.js b/cypress/integration/video.ogv.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/cypress/integration/video.webm.spec.js b/cypress/integration/video.webm.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/cypress/integration/videos.spec.js b/cypress/integration/videos.spec.js
@@ -20,8 +20,6 @@
  *
  */
 
-// Import font so CI has the same
-import '!url-loader!style-loader!css-loader?fontsource-roboto'
 import { randHash } from '../utils/'
 const randUser = randHash()
 
diff --git a/src/main.js b/src/main.js
@@ -42,6 +42,12 @@ __webpack_nonce__ = btoa(OC.requestToken)
 // eslint-disable-next-line
 __webpack_public_path__ = generateFilePath('viewer', '', 'js/')
 
+// Inject proper font for cypress visual regression testing
+if (isTesting) {
+	// Import font so CI has the same
+	import('fontsource-roboto')
+}
+
 // Init Viewer Service
 if (window.OCA) {
 	Object.assign(window.OCA, { Viewer: new ViewerService() })

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`	`*`
`21`	`21`	`*/`
`22`	`22`
`23`		`-// Import font so CI has the same`
`24`		`-import '!url-loader!style-loader!css-loader?fontsource-roboto'`
`25`	`23`	`import { randHash } from '../utils/'`
`26`	`24`	`const randUser = randHash()`
`27`	`25`