Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ module.exports = {
"react-app",
"eslint:recommended",
"plugin:react/recommended",
"plugin:cypress/recommended",
"plugin:@typescript-eslint/recommended",
],
parser: "@typescript-eslint/parser",
Expand Down Expand Up @@ -43,8 +42,7 @@ module.exports = {
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "warn",
},
plugins: ["cypress", "@typescript-eslint", "react-hooks", "unused-imports"],
env: { "cypress/globals": true },
plugins: ["@typescript-eslint", "react-hooks", "unused-imports"],
settings: {
react: {
pragma: "React",
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: "Shared Master Workflow"

on:
push:
branches: ["master", "development"]
pull_request:
branches: [ "master", "development" ]
workflow_dispatch:
push:
branches: ["master", "development"]
pull_request:

workflow_dispatch:

jobs:
master-workflow:
uses: EyeSeeTea/github-workflows/.github/workflows/master.yml@master
master-workflow:
uses: EyeSeeTea/github-workflows/.github/workflows/master.yml@master
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ src/locales/
src/react-app.d.ts
src/react-app-env.d.ts

# cypress
cypress/screenshots/
cypress/videos/

# IntelliJ
.idea/*

Expand Down
41 changes: 0 additions & 41 deletions .travis.yml

This file was deleted.

17 changes: 0 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,6 @@ Run unit tests:
$ yarn test
```

Run integration tests locally:

```
$ export CYPRESS_DHIS2_AUTH='admin:district'
$ export CYPRESS_EXTERNAL_API="http://localhost:8080"
$ export CYPRESS_ROOT_URL=http://localhost:8081

# non-interactive
$ yarn cy:e2e:run

# interactive UI
$ yarn cy:e2e:open
```

For this to work in Travis CI, you will have to create an environment variable CYPRESS_DHIS2_AUTH (Settings -> Environment Variables) with the password used in your testing DHIS2 instance.

## Build app ZIP

```
Expand All @@ -106,7 +90,6 @@ $ yarn build-webapp
- `src/types`: `.d.ts` file types for modules without TS definitions.
- `src/utils`: Misc utilities.
- `src/locales`: Auto-generated, don't change nor add to version control.
- `cypress/integration/`: Contains the integration Cypress tests.

### i18n

Expand Down
4 changes: 0 additions & 4 deletions cypress.json

This file was deleted.

5 changes: 0 additions & 5 deletions cypress/fixtures/example.json

This file was deleted.

18 changes: 0 additions & 18 deletions cypress/integration/example-page.spec.js

This file was deleted.

23 changes: 0 additions & 23 deletions cypress/plugins/index.js

This file was deleted.

102 changes: 0 additions & 102 deletions cypress/support/commands.js

This file was deleted.

18 changes: 0 additions & 18 deletions cypress/support/index.js

This file was deleted.

Loading
Loading