Skip to content

Commit

Permalink
[RND-615] Meadowlark e2e tests improvements for local development (#283)
Browse files Browse the repository at this point in the history
* Renaming .env in e2e tests to .env-e2e

* Rename file

* Rename env file on actions

* Update test containers package

* Import adjustments for new testcontainers version

* Adding flag to run against local environment

* Removing console log

* Adding documentation
  • Loading branch information
andonyns authored Aug 8, 2023
1 parent 51c6673 commit 14c6e51
Show file tree
Hide file tree
Showing 19 changed files with 474 additions and 367 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/on-pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@ jobs:

- name: Create .env file
run: |
touch .env
echo OAUTH_SIGNING_KEY="$( openssl rand -base64 256 | tr -d '\n' )" >> .env
touch .env-e2e
echo OAUTH_SIGNING_KEY="$( openssl rand -base64 256 | tr -d '\n' )" >> .env-e2e
working-directory: Meadowlark-js/tests/e2e/setup/

- name: End to End tests for ${{matrix.store.db}} as store and ${{matrix.query_handler.provider}} as query handler
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.env
.env.*
.env-*
!.env.example
Meadowlark-js/.env-docker
!.env-*.example
**/node_modules/
Meadowlark-js/sbom
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
"copyfiles": "^2.4.1",
"dotenv": "^16.3.1",
"rimraf": "^3.0.2",
"testcontainers": "^9.10.0"
"testcontainers": "^10.0.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
"copyfiles": "^2.4.1",
"dotenv": "^16.3.1",
"rimraf": "^3.0.2",
"testcontainers": "^9.10.0"
"testcontainers": "^10.0.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@
"ts-invariant": "^0.10.3"
},
"devDependencies": {
"@testcontainers/postgresql": "^10.0.2",
"@types/pg": "^8.10.2",
"@types/pg-format": "^1.0.2",
"copyfiles": "^2.4.1",
"dotenv": "^16.3.1",
"rimraf": "^3.0.2",
"testcontainers": "^9.10.0"
"testcontainers": "^10.0.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
// See the LICENSE and NOTICES files in the project root for more information.

import { Logger } from '@edfi/meadowlark-utilities';
import { PostgreSqlContainer, StartedTestContainer } from 'testcontainers';
import { PostgreSqlContainer } from '@testcontainers/postgresql';
import { StartedTestContainer } from 'testcontainers';

let startedContainer: StartedTestContainer;

Expand Down
Loading

0 comments on commit 14c6e51

Please sign in to comment.