Update CI workflow tests (#441)

FortAwesome · Jan 23, 2023 · bf1457d · bf1457d
1 parent 0e264de
commit bf1457d
Show file tree

Hide file tree

Showing 8 changed files with 78 additions and 3,715 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,18 +35,26 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - name: install, build, and test
+    - name: v5 install, build, and test
+      if: ${{ matrix.free-solid-svg-icons }} == '5.x'
       run: |
         npm install -g npm
         npm install
-        npm install --no-save @fortawesome/fontawesome-svg-core@${{ matrix.fontawesome-svg-core }} @fortawesome/free-solid-svg-icons@${{ matrix.free-solid-svg-icons }} vue@${{ matrix.vue }}
+        npm install --no-save @fortawesome/fontawesome-svg-core@1.2.x @fortawesome/free-solid-svg-icons@5.x vue@${{ matrix.vue }}
         npm run build
         npm list vue
-        npm run test.5
-        npm run test.6
+        npm run test
+    - name: v6 install, build, and test
+      if: ${{ matrix.free-solid-svg-icons }} == '6.x'
+      run: |
+        npm install -g npm
+        npm install
+        npm install --no-save @fortawesome/fontawesome-svg-core@6.x @fortawesome/free-solid-svg-icons@6.x vue@${{ matrix.vue }}
+        npm run build
+        npm list vue
+        npm run test
       env:
         CI: true
-        FONTAWESOME_NPM_AUTH_TOKEN: ${{ secrets.FONTAWESOME_NPM_AUTH_TOKEN }}
     - name: dist
       run: |
         npm run dist
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,9 +41,7 @@
   "scripts": {
     "build": "rollup -c rollup.config.js",
     "dist": "cross-env NODE_ENV=production npm run build",
-    "test": "npm run test.5 && npm run test.6",
-    "test.5": "npm --no-save install @fortawesome/fontawesome-svg-core@1.2.x @fortawesome/free-solid-svg-icons@5.x && jest --silent",
-    "test.6": "npm --no-save install @fortawesome/fontawesome-svg-core@6.x @fortawesome/free-solid-svg-icons@6.x && jest --silent",
+    "test": "jest --silent",
     "prepack": "npm run dist"
   },
   "lint-staged": {
@@ -86,5 +84,6 @@
     "hooks": {
       "pre-commit": "lint-staged"
     }
-  }
+  },
+  "dependencies": {}
 }
diff --git a/src/components/__fixtures__/helpers.js b/src/components/__fixtures__/helpers.js
@@ -1,4 +1,4 @@
-import Vue from 'vue/dist/vue'
+import Vue from 'vue/dist/vue.js'
 import FontAwesomeIcon from '../FontAwesomeIcon'
 import { parse } from '@fortawesome/fontawesome-svg-core'
 

diff --git a/src/components/__tests__/FontAwesomeIcon.test.js b/src/components/__tests__/FontAwesomeIcon.test.js
@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import Vue from 'vue/dist/vue'
+import Vue from 'vue/dist/vue.js'
 import FontAwesomeIcon from '../FontAwesomeIcon'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faClose, faUser } from '@fortawesome/free-solid-svg-icons'

diff --git a/src/components/__tests__/FontAwesomeLayers.test.js b/src/components/__tests__/FontAwesomeLayers.test.js
@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import Vue from 'vue/dist/vue'
+import Vue from 'vue/dist/vue.js'
 import FontAwesomeLayers from '../FontAwesomeLayers'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faCoffee, faCircle } from '../__fixtures__/icons'

diff --git a/src/components/__tests__/FontAwesomeLayersText.test.js b/src/components/__tests__/FontAwesomeLayersText.test.js
@@ -2,7 +2,7 @@
  * @jest-environment jsdom
  */
 
-import Vue from 'vue/dist/vue'
+import Vue from 'vue/dist/vue.js'
 import FontAwesomeLayersText from '../FontAwesomeLayersText'
 import { compileAndMount } from '../__fixtures__/helpers'