Merge pull request #37 from sparksuite/refactor-testing

Refactor testing to be based around real-world programs

.github/workflows/main.yml

@@ -74,7 +74,7 @@ jobs:
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
-      - run: yarn dev
+      - run: yarn install --frozen-lockfile --prefer-offline
       - run: yarn test
       - name: Codecov
         uses: codecov/codecov-action@v1

README.md

@@ -113,8 +113,6 @@ You should not call the validator more often than **1 req/sec**. From W3C’s [m
 
 ## Local development
 
-To prep a just-cloned or just-cleaned repository for local development, run `yarn dev`.
-
 To test the whole project, run `yarn test`.
 
 To format the code, run `yarn format`.

.eslintrc.json → eslint.base.json

@@ -3,7 +3,6 @@
 		"eslint:recommended",
 		"plugin:@typescript-eslint/eslint-recommended",
 		"plugin:@typescript-eslint/recommended",
-		"plugin:@typescript-eslint/recommended-requiring-type-checking",
 		"prettier"
 	],
 	"env": {
@@ -17,8 +16,7 @@
 		"sourceType": "module",
 		"ecmaFeatures": {
 			"modules": true
-		},
-		"project": ["./tsconfig.json", "./tsconfig.eslint.json"]
+		}
 	},
 	"plugins": ["@typescript-eslint"],
 	"rules": {

eslint.src.json

@@ -0,0 +1,6 @@
+{
+	"extends": ["./eslint.base.json", "plugin:@typescript-eslint/recommended-requiring-type-checking"],
+	"parserOptions": {
+		"project": ["./tsconfig.json"]
+	}
+}

eslint.tests.json

@@ -0,0 +1,3 @@
+{
+	"extends": ["./eslint.base.json"]
+}

package.json

@@ -8,10 +8,9 @@
 		"dist/"
 	],
 	"scripts": {
-		"dev": "yarn --frozen-lockfile --check-files && yarn compile && yarn link && cd test/puppeteer && yarn --frozen-lockfile --check-files && yarn link \"w3c-css-validator\" && npx webpack",
-		"test": "jest",
-		"lint": "eslint --ext .js,.ts . && prettier --check '**/*.{ts,js,json,yml}'",
-		"format": "eslint --fix --ext .js,.ts . && prettier --write '**/*.{ts,js,json,yml}'",
+		"test": "yarn compile && for directory in ./tests/*/ ; do (yarn --cwd \"$directory\" test); done",
+		"lint": "eslint --config ./eslint.src.json --ext .js,.ts ./src && eslint --config ./eslint.tests.json --ext .js,.ts ./tests && prettier --check '**/*.{ts,js,json,yml}'",
+		"format": "eslint --config ./eslint.src.json --fix --ext .js,.ts ./src && eslint --config ./eslint.tests.json --ext .js,.ts ./tests && prettier --write '**/*.{ts,js,json,yml}'",
 		"clean": "git clean -X -d --force && find . -type d -empty -delete",
 		"precompile": "rm -rf dist/",
 		"compile": "tsc --project tsconfig.build.json"
@@ -34,20 +33,12 @@
 	"homepage": "https://github.com/sparksuite/w3c-css-validator",
 	"dependencies": {},
 	"devDependencies": {
-		"@types/jest": "^26.0.20",
-		"@types/jest-environment-puppeteer": "^4.4.1",
 		"@types/node": "^14.14.25",
 		"@typescript-eslint/eslint-plugin": "^4.14.2",
 		"@typescript-eslint/parser": "^4.14.2",
 		"eslint": "^7.19.0",
 		"eslint-config-prettier": "^8.0.0",
-		"jest": "^26.6.3",
-		"jest-puppeteer": "^4.4.0",
-		"merge": "^2.1.1",
 		"prettier": "^2.2.1",
-		"puppeteer": "^7.1.0",
-		"ts-jest": "^26.5.2",
-		"ts-node": "^9.1.1",
 		"typescript": "^4.1.3"
 	}
 }