diff --git a/.github/workflows/productionintegration.yml b/.github/workflows/productionintegration.yml index f77fa06..fc6d987 100644 --- a/.github/workflows/productionintegration.yml +++ b/.github/workflows/productionintegration.yml @@ -18,8 +18,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install requests + pip install requests nose2 selenium - name: Test with pytest run: | - pip install nose2 - cd test-production-integration && nose2 -v + cd test-production-integration && nose2 -v test_selenium diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..3d6a3f4 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +test-push: + act -P ubuntu-latest=nektos/act-environments-ubuntu:18.04 +test-schedule: + act schedule -P ubuntu-latest=nektos/act-environments-ubuntu:18.04 diff --git a/README.md b/README.md index 3a667e0..ec13666 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,16 @@ We have unit tests to test the validators. There are several naming conventions: 1. ```invalid_*``` - These are invalid files that fail validation 1. ```invaliddata_*``` - These are valid files that pass validation but fail to match with data in MassIVE +To run all unit tests, we are using [act](https://github.com/nektos/act) to run github actions locally: + +```make test-push``` + +to simulate a push to the repository and run the full suite of unit tests exactly as we'd run at github. + +To simulate selenium and production integration tests: + +```make test-schedule``` + ## Updating ReDU Data Procedure One of the key steps in ReDU is the updating of the database to include the latest identifications for files within ReDU. These are the following steps: diff --git a/code/templates/compoundenrichment.html b/code/templates/compoundenrichment.html index 2b532bb..491f6b4 100644 --- a/code/templates/compoundenrichment.html +++ b/code/templates/compoundenrichment.html @@ -20,10 +20,20 @@

Chemical Enrichment Query Interface

-
+
-
+
+ +
+
+
+
+
+
+
+ +
diff --git a/code/templates/layout.html b/code/templates/layout.html index 0831602..500f39f 100644 --- a/code/templates/layout.html +++ b/code/templates/layout.html @@ -80,7 +80,7 @@