From 149976bfab0f2089ebd566a07409d4a6d517af0f Mon Sep 17 00:00:00 2001
From: Ben Thorner <ben.thorner@digital.cabinet-office.gov.uk>
Date: Wed, 16 Jun 2021 13:01:56 +0100
Subject: [PATCH] Run tests directly from the Makefile

Contributes to: https://github.com/alphagov/notifications-manuals/issues/9

Precedent: https://github.com/alphagov/notifications-admin/pull/3897
---
 Makefile             |  4 +++-
 scripts/run_tests.sh | 38 --------------------------------------
 2 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100755 scripts/run_tests.sh

diff --git a/Makefile b/Makefile
index f86769a13..18a643dcf 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,9 @@ generate-version-file: ## Generates the app version file
 
 .PHONY: test
 test: test-requirements ## Run tests
-	./scripts/run_tests.sh
+	flake8 .
+	isort --check-only ./app ./tests
+	pytest -n4 --maxfail=10
 
 .PHONY: freeze-requirements
 freeze-requirements: ## Pin all requirements including sub dependencies into requirements.txt
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
deleted file mode 100755
index e60dbc5f5..000000000
--- a/scripts/run_tests.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-#
-# Run project tests
-#
-# NOTE: This script expects to be run from the project root with
-# ./scripts/run_tests.sh
-
-set -o pipefail
-
-function display_result {
-  RESULT=$1
-  EXIT_STATUS=$2
-  TEST=$3
-
-  if [ $RESULT -ne 0 ]; then
-    echo -e "\033[31m$TEST failed\033[0m"
-    exit $EXIT_STATUS
-  else
-    echo -e "\033[32m$TEST passed\033[0m"
-  fi
-}
-
-if [[ -z "$VIRTUAL_ENV" ]] && [[ -d venv ]]; then
-  source ./venv/bin/activate
-fi
-
-make test-requirements
-display_result $? 1 "Requirements check"
-
-flake8 .
-display_result $? 1 "Code style check"
-
-isort --check-only ./app ./tests
-display_result $? 2 "Import order check"
-
-# run with four concurrent threads
-py.test -n4 -v --maxfail=10
-display_result $? 2 "Unit tests"