Updating makefile commands

.prettierignore

@@ -1 +1,2 @@
-tests/functional/generated_pages/
+# Exclude generated_pages directory
+tests/functional/generated_pages/

Makefile

@@ -1,6 +1,7 @@
 SCHEMAS_VERSION=`cat .schemas-version`
 DESIGN_SYSTEM_VERSION=`cat .design-system-version`
 RUNNER_ENV_FILE?=.development.env
+SCHEMA_PATH=./schemas/test/en/
 
 clean:
 	find schemas/* -prune | grep -v "schemas/test" | xargs rm -r
@@ -16,14 +17,14 @@ load-design-system-templates:
 
 build: load-design-system-templates load-schemas translate
 
-lint: lint-python
-	yarn lint
+lint: lint-python lint-js
 
 lint-python:
 	pipenv run ./scripts/run_lint_python.sh
 
-format: format-python
-	yarn format
+lint-test-python: lint-python test-unit
+
+format: format-python format-js
 
 format-python:
 	pipenv run isort .
@@ -38,9 +39,27 @@ test-unit:
 test-functional:
 	pipenv run ./scripts/run_tests_functional.sh
 
+test-functional-headless:
+	EQ_RUN_FUNCTIONAL_TESTS_HEADLESS='True' pipenv run ./scripts/run_tests_functional.sh
+
+test-functional-spec:
+	yarn test_functional --spec ./tests/functional/spec/$(SPEC)
+
+test-functional-suite:
+	yarn test_functional --suite $(SUITE)
+
+lint-js:
+	yarn lint
+
+format-js:
+	yarn format
+
 validate-test-schemas:
 	pipenv run ./scripts/validate_test_schemas.sh
 
+validate-test-schema:
+	pipenv run ./scripts/validate_test_schemas.sh $(SCHEMA_PATH)$(SCHEMA)
+
 translation-templates:
 	pipenv run python -m scripts.extract_translation_templates
 

README.md

@@ -241,11 +241,16 @@ RUNNER_ENV_FILE=.functional-tests.env make run
 
 This will set the correct environment variables for running the functional tests.
 
-Then you can run:
+Then you can run either:
 
 ``` shell
 make test-functional
 ```
+or
+
+``` shell
+make test-functional-headless
+```
 
 This will delete the `tests/functional/generated_pages` directory and regenerate all the files in it from the schemas.
 
@@ -256,7 +261,6 @@ yarn generate_pages
 yarn test_functional
 ```
 
-
 To generate the pages manually you can run the `generate_pages` scripts with the schema directory. Run it from the `tests/functional` directory as follows:
 
 ``` shell
@@ -278,7 +282,7 @@ yarn test_functional
 This can be limited to a single spec using:
 
 ``` shell
-yarn test_functional --spec ./tests/functional/spec/exit.spec.js
+make test-functional-spec SPEC=<spec>
 ```
 
 To run a single test, add `.only` into the name of any `describe` or `it` function:
@@ -291,7 +295,7 @@ Test suites are configured in the `wdio.conf.js` file.
 An individual test suite can be run using:
 
 ``` shell
-yarn test_functional --suite <suite>
+make test-functional-suite SUITE=<suite>
 ```
 
 To run the tests against a remote deployment you will need to specify the environment variable of EQ_FUNCTIONAL_TEST_ENV eg:

setup.cfg

@@ -6,3 +6,8 @@ filterwarnings=
     ignore:.*formatargspec.*:DeprecationWarning
     ignore:.*isAlive.*:PendingDeprecationWarning
 
+[flake8]
+# Ignore node_modules and cloned repos when not in a virtual environment
+exclude = node_modules/*,tests/*,src/*
+max-line-length = 160
+ignore = C815,C816,W503,E203