@{
> DownloadProjectExport(
IEnumerable statusFilters = default,
IEnumerable deliveryOfficerFilter = default,
IEnumerable regionsFilter = default,
- IEnumerable applicationReferences = default
+ IEnumerable localAuthoritiesFilter = default,
+ IEnumerable advisoryBoardDatesFilter = default
)
{
- return await _innerRepository.DownloadProjectExport(page, count, titleFilter, statusFilters, deliveryOfficerFilter, regionsFilter, applicationReferences);
+ return await _innerRepository.DownloadProjectExport(page, count, titleFilter, statusFilters, deliveryOfficerFilter, regionsFilter, localAuthoritiesFilter, advisoryBoardDatesFilter);
}
public async Task> GetProjectById(int id)
{
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs
index 5528c796b..ebf67b88d 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs
@@ -62,6 +62,8 @@ public void ConfigureServices(IServiceCollection services)
.AddRazorPages(options =>
{
options.Conventions.AuthorizeFolder("/");
+ options.Conventions.AllowAnonymousToPage("/public/maintenance");
+ options.Conventions.AllowAnonymousToPage("/public/accessibility");
})
.AddViewOptions(options =>
{
diff --git a/README.md b/README.md
index 37c2061cd..1602dd0d8 100644
--- a/README.md
+++ b/README.md
@@ -34,48 +34,24 @@ Install cypress and dependencies:
- Run 'npm install' from the Dfe.PrepareConversions.CypressTests directory
### Test execution
-You will need to set a secret in `secrets.json` in the following format to run the Cypress command against (you can use any value):
+
+To execute the tests locally and view the output, you will need to set environment variables. Create a new file named `cypress.env.json` in the project root with the following content:
```json
{
- "CypressTestSecret": ""
+ "url": "BASE_URL_OF_APP",
+ "cypressTestSecret": "",
+ "academisationApiUrl": "",
+ "academisationApiKey": ""
}
-```
-
-To execute the tests locally and view the output:
-
-First set the database config as an environment variable -
-For bash -
-```
-export db='{"server":"localhost", "userName":"sa", "password":"StrongPassword905", "options": { "database": "sip" } }'
-```
-For windows -
-```
-set db='{"server":"localhost", "userName":"sa", "password":"StrongPassword905", "options": { "database": "sip" } }'
-```
-The secret in the below command should match what was set in the `secrets.json` file.
-```
-npm run cy:open -- --env url="BASE_URL_OF_APP",authorizationHeader=""
-```
+Please make sure to replace `` with the actual secret values in the `cypress.env.json` file before running the tests.
-To execute the tests in headless mode, run the following (the output will log to the console):
+### Open the Cypress Test Runner for interactive testing
+npx cypress open
-```
-npm run cy:run -- --env url="BASE_URL_OF_APP",authorizationHeader=""
-```
-
-### Loading users from Azure Active Directory
-You will need to set a secret in `secrets.json` in the following format to run the Cypress command against (you can use any value):
-
-```
- "AzureAd": {
- "ClientId": "",
- "ClientSecret": "",
- "TenantId": "",
- "GroupId": ""
- }
-```
+### Run the Cypress tests in headless mode
+npx cypress run
### Useful tips
@@ -143,35 +119,6 @@ it('Has no detectable a11y violations on load (with custom parameters)', () => {
For more receipes: https://www.npmjs.com/package/cypress-axe
-##### Upgrading Cypress version
-EVERY 6 to 8 weeks, there is a significant update that will be rolled out with some changes.
-To see the cypress change longs navigate to this link: https://docs.cypress.io/guides/references/changelog#
-Here you can view the bug fixes, performance fixes and features etc. Latest version you will find at the top of the list with release date. You can jump to the specific version by clicking on the links on the right side under section on this page.
-
-## Update Cypress using NPM
--Close the cypress runner properly by clicking on Stop button then x button.
-
--Type below command. Here replace 12.2.0 with latest version
- `npm install --save-dev cypress@12.2.0`
-
--Check Cypress version is updated using below command
- `$ npx cypress --version`
-
- ##Update Cypress using package.json
- -Cose the cypress runner properly by clicking on Stop button then x button.
-
- -Navigate to your package.json.
-
- -Change the cypress version to the current updated version in package.json
- `"cypress": "12.2.0"`
-
- -Type below command
- `$ npx install cypress`
-
- -Check cypress version
- `$ npx cypress --version`
-
-
##### Cypress Linting
ESLint is a tool for identifying and reporting on patterns found in ECMAScript/JavaScript code, with the goal of making code more consistent and avoiding bugs.
@@ -250,4 +197,4 @@ NO_PROXY=""
```
and setting the runtime variables
-`zapReport=true,zapApiKey=,zapUrl=""`
\ No newline at end of file
+`zapReport=true,zapApiKey=,zapUrl=""`