Merge pull request #122 from dfe-analytical-services/remove-3year-tim…

…eseries-check remove 3 year timeseries test
dfe-analytical-services · Jul 10, 2024 · 4f5525a · 4f5525a
2 parents 268a384 + 421ecda
commit 4f5525a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 41 deletions.
diff --git a/.github/workflows/automatedTests.yaml b/.github/workflows/automatedTests.yaml
@@ -24,11 +24,20 @@ jobs:
 
       - name: Install git2r dependencies
         run: sudo apt-get install -y libgit2-dev
+
+      - name: Cache renv packages
+        id: cache-renv
+        uses: actions/cache@v4
+        with:
+          path: screener-renv-cache
+          key: ${{ runner.os }}-renv-${{ hashFiles('**/renv.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-renv-
       
       - uses: r-lib/actions/setup-renv@v2
 
       - name: Run tests 
         shell: Rscript {0}
         run: |
           shinytest2::test_app()
-          
+          
diff --git a/R/mainTests.r b/R/mainTests.r
@@ -18,7 +18,6 @@ mainTests <- function(data_character, meta_character, datafile, metafile) {
       blanks_indicators(data_character, meta_character), # active test
       time_period(datafile), # active test
       time_period_six(datafile), # active test
-      three_years(datafile), # active test
       region_for_la(datafile), # active test
       region_for_lad(datafile), # active test
       geography_level_completed(datafile), # active test
@@ -707,25 +706,6 @@ time_period_six <- function(data) {
   return(output)
 }
 
-# three_years -------------------------------------
-# produce a warning if there are fewer than 3 years of data in the file
-
-three_years <- function(data) {
-  if (length(unique(data$time_period)) < 3) {
-    output <- list(
-      "message" = "The data file contains fewer than three different years of data. <br> - Where it exists, you should include at least 3 years of data in your file to meet upcoming changes in accessibility legislation.",
-      "result" = "ADVISORY"
-    )
-  } else {
-    output <- list(
-      "message" = "The data file contains at least three different years of data.",
-      "result" = "PASS"
-    )
-  }
-
-  return(output)
-}
-
 # region_for_la -------------------------------------
 # check if there is LA level data, and if so, if regional columns are present and completed
 

diff --git a/tests/testthat/_snaps/UI-01_example_files/example_files-002.json b/tests/testthat/_snaps/UI-01_example_files/example_files-002.json
@@ -214,7 +214,7 @@
     }
   },
   "export": {
-    "advisory": 1,
+    "advisory": 0,
     "ancillary": 1,
     "failed": 1,
     "ignored": 17,

diff --git a/tests/testthat/mainTests/three_years.csv b/tests/testthat/mainTests/three_years.csv
diff --git a/tests/testthat/mainTests/three_years.meta.csv b/tests/testthat/mainTests/three_years.meta.csv
diff --git a/tests/testthat/test-function-mainTests.R b/tests/testthat/test-function-mainTests.R
@@ -102,12 +102,6 @@ test_that("time_period_six", {
   expect_equal(testIndividualTest(pathStart, "time_period_six"), "FAIL")
 })
 
-# three_years -------------------------------------------------------------------------------------------------------
-
-test_that("three_years", {
-  expect_equal(testIndividualTest(pathStart, "three_years"), "ADVISORY")
-})
-
 # region_for_la -------------------------------------------------------------------------------------------------------
 
 test_that("region_for_la", {